diff options
| -rw-r--r-- | source/core/basic.h | 13 | ||||
| -rw-r--r-- | source/core/core.vcxproj | 40 | ||||
| -rw-r--r-- | source/core/core.vcxproj.filters | 78 | ||||
| -rw-r--r-- | source/core/slang-allocator.h (renamed from source/core/allocator.h) | 4 | ||||
| -rw-r--r-- | source/core/slang-array-view.h (renamed from source/core/array-view.h) | 6 | ||||
| -rw-r--r-- | source/core/slang-array.h (renamed from source/core/array.h) | 8 | ||||
| -rw-r--r-- | source/core/slang-basic.h | 13 | ||||
| -rw-r--r-- | source/core/slang-byte-encode-util.cpp | 2 | ||||
| -rw-r--r-- | source/core/slang-byte-encode-util.h | 6 | ||||
| -rw-r--r-- | source/core/slang-common.h (renamed from source/core/common.h) | 4 | ||||
| -rw-r--r-- | source/core/slang-dictionary.h (renamed from source/core/dictionary.h) | 13 | ||||
| -rw-r--r-- | source/core/slang-exception.h (renamed from source/core/exception.h) | 8 | ||||
| -rw-r--r-- | source/core/slang-free-list.h | 6 | ||||
| -rw-r--r-- | source/core/slang-hash.h (renamed from source/core/hash.h) | 4 | ||||
| -rw-r--r-- | source/core/slang-io.cpp | 2 | ||||
| -rw-r--r-- | source/core/slang-io.h | 10 | ||||
| -rw-r--r-- | source/core/slang-list.h (renamed from source/core/list.h) | 8 | ||||
| -rw-r--r-- | source/core/slang-math.h | 4 | ||||
| -rw-r--r-- | source/core/slang-memory-arena.h | 4 | ||||
| -rw-r--r-- | source/core/slang-object-scope-manager.h | 8 | ||||
| -rw-r--r-- | source/core/slang-platform.cpp (renamed from source/core/platform.cpp) | 6 | ||||
| -rw-r--r-- | source/core/slang-platform.h (renamed from source/core/platform.h) | 6 | ||||
| -rw-r--r-- | source/core/slang-random-generator.h | 6 | ||||
| -rw-r--r-- | source/core/slang-render-api-util.cpp | 6 | ||||
| -rw-r--r-- | source/core/slang-render-api-util.h | 4 | ||||
| -rw-r--r-- | source/core/slang-secure-crt.h (renamed from source/core/secure-crt.h) | 4 | ||||
| -rw-r--r-- | source/core/slang-shared-library.cpp | 5 | ||||
| -rw-r--r-- | source/core/slang-shared-library.h | 12 | ||||
| -rw-r--r-- | source/core/slang-smart-pointer.h (renamed from source/core/smart-pointer.h) | 10 | ||||
| -rw-r--r-- | source/core/slang-std-writers.h | 4 | ||||
| -rw-r--r-- | source/core/slang-stream.cpp (renamed from source/core/stream.cpp) | 2 | ||||
| -rw-r--r-- | source/core/slang-stream.h (renamed from source/core/stream.h) | 6 | ||||
| -rw-r--r-- | source/core/slang-string-slice-pool.h | 8 | ||||
| -rw-r--r-- | source/core/slang-string-util.h | 6 | ||||
| -rw-r--r-- | source/core/slang-string.cpp | 2 | ||||
| -rw-r--r-- | source/core/slang-string.h | 12 | ||||
| -rw-r--r-- | source/core/slang-test-tool-util.h | 4 | ||||
| -rw-r--r-- | source/core/slang-text-io.cpp (renamed from source/core/text-io.cpp) | 2 | ||||
| -rw-r--r-- | source/core/slang-text-io.h (renamed from source/core/text-io.h) | 8 | ||||
| -rw-r--r-- | source/core/slang-token-reader.cpp (renamed from source/core/token-reader.cpp) | 2 | ||||
| -rw-r--r-- | source/core/slang-token-reader.h (renamed from source/core/token-reader.h) | 8 | ||||
| -rw-r--r-- | source/core/slang-type-traits.h (renamed from source/core/type-traits.h) | 4 | ||||
| -rw-r--r-- | source/core/slang-uint-set.h | 8 | ||||
| -rw-r--r-- | source/core/slang-writer.cpp | 2 | ||||
| -rw-r--r-- | source/core/slang-writer.h | 6 | ||||
| -rw-r--r-- | source/slang/slang-c-like-source-emitter.cpp | 38 | ||||
| -rw-r--r-- | source/slang/slang-c-like-source-emitter.h | 10 | ||||
| -rw-r--r-- | source/slang/slang-check.cpp (renamed from source/slang/check.cpp) | 10 | ||||
| -rw-r--r-- | source/slang/slang-check.h (renamed from source/slang/check.h) | 4 | ||||
| -rw-r--r-- | source/slang/slang-compiler.cpp (renamed from source/slang/compiler.cpp) | 30 | ||||
| -rw-r--r-- | source/slang/slang-compiler.h (renamed from source/slang/compiler.h) | 10 | ||||
| -rw-r--r-- | source/slang/slang-decl-defs.h (renamed from source/slang/decl-defs.h) | 2 | ||||
| -rw-r--r-- | source/slang/slang-diagnostic-defs.h (renamed from source/slang/diagnostic-defs.h) | 0 | ||||
| -rw-r--r-- | source/slang/slang-diagnostics.cpp (renamed from source/slang/diagnostics.cpp) | 12 | ||||
| -rw-r--r-- | source/slang/slang-diagnostics.h (renamed from source/slang/diagnostics.h) | 8 | ||||
| -rw-r--r-- | source/slang/slang-dxc-support.cpp (renamed from source/slang/dxc-support.cpp) | 6 | ||||
| -rw-r--r-- | source/slang/slang-emit-context.h | 6 | ||||
| -rw-r--r-- | source/slang/slang-emit-precedence.h | 2 | ||||
| -rw-r--r-- | source/slang/slang-emit.cpp (renamed from source/slang/emit.cpp) | 44 | ||||
| -rw-r--r-- | source/slang/slang-emit.h (renamed from source/slang/emit.h) | 6 | ||||
| -rw-r--r-- | source/slang/slang-expr-defs.h (renamed from source/slang/expr-defs.h) | 4 | ||||
| -rw-r--r-- | source/slang/slang-extension-usage-tracker.h | 4 | ||||
| -rw-r--r-- | source/slang/slang-file-system.cpp | 2 | ||||
| -rw-r--r-- | source/slang/slang-file-system.h | 2 | ||||
| -rw-r--r-- | source/slang/slang-image-format-defs.h (renamed from source/slang/image-format-defs.h) | 2 | ||||
| -rw-r--r-- | source/slang/slang-ir-bind-existentials.cpp (renamed from source/slang/ir-bind-existentials.cpp) | 10 | ||||
| -rw-r--r-- | source/slang/slang-ir-bind-existentials.h (renamed from source/slang/ir-bind-existentials.h) | 2 | ||||
| -rw-r--r-- | source/slang/slang-ir-clone.cpp (renamed from source/slang/ir-clone.cpp) | 8 | ||||
| -rw-r--r-- | source/slang/slang-ir-clone.h (renamed from source/slang/ir-clone.h) | 8 | ||||
| -rw-r--r-- | source/slang/slang-ir-constexpr.cpp (renamed from source/slang/ir-constexpr.cpp) | 8 | ||||
| -rw-r--r-- | source/slang/slang-ir-constexpr.h (renamed from source/slang/ir-constexpr.h) | 2 | ||||
| -rw-r--r-- | source/slang/slang-ir-dce.cpp (renamed from source/slang/ir-dce.cpp) | 8 | ||||
| -rw-r--r-- | source/slang/slang-ir-dce.h (renamed from source/slang/ir-dce.h) | 2 | ||||
| -rw-r--r-- | source/slang/slang-ir-dominators.cpp (renamed from source/slang/ir-dominators.cpp) | 6 | ||||
| -rw-r--r-- | source/slang/slang-ir-dominators.h (renamed from source/slang/ir-dominators.h) | 4 | ||||
| -rw-r--r-- | source/slang/slang-ir-entry-point-uniforms.cpp (renamed from source/slang/ir-entry-point-uniforms.cpp) | 10 | ||||
| -rw-r--r-- | source/slang/slang-ir-entry-point-uniforms.h (renamed from source/slang/ir-entry-point-uniforms.h) | 2 | ||||
| -rw-r--r-- | source/slang/slang-ir-glsl-legalize.cpp (renamed from source/slang/ir-glsl-legalize.cpp) | 8 | ||||
| -rw-r--r-- | source/slang/slang-ir-glsl-legalize.h (renamed from source/slang/ir-glsl-legalize.h) | 2 | ||||
| -rw-r--r-- | source/slang/slang-ir-inst-defs.h (renamed from source/slang/ir-inst-defs.h) | 2 | ||||
| -rw-r--r-- | source/slang/slang-ir-insts.h (renamed from source/slang/ir-insts.h) | 10 | ||||
| -rw-r--r-- | source/slang/slang-ir-legalize-types.cpp (renamed from source/slang/ir-legalize-types.cpp) | 14 | ||||
| -rw-r--r-- | source/slang/slang-ir-link.cpp (renamed from source/slang/ir-link.cpp) | 10 | ||||
| -rw-r--r-- | source/slang/slang-ir-link.h (renamed from source/slang/ir-link.h) | 4 | ||||
| -rw-r--r-- | source/slang/slang-ir-missing-return.cpp (renamed from source/slang/ir-missing-return.cpp) | 6 | ||||
| -rw-r--r-- | source/slang/slang-ir-missing-return.h (renamed from source/slang/ir-missing-return.h) | 2 | ||||
| -rw-r--r-- | source/slang/slang-ir-restructure-scoping.cpp (renamed from source/slang/ir-restructure-scoping.cpp) | 10 | ||||
| -rw-r--r-- | source/slang/slang-ir-restructure-scoping.h (renamed from source/slang/ir-restructure-scoping.h) | 2 | ||||
| -rw-r--r-- | source/slang/slang-ir-restructure.cpp (renamed from source/slang/ir-restructure.cpp) | 6 | ||||
| -rw-r--r-- | source/slang/slang-ir-restructure.h (renamed from source/slang/ir-restructure.h) | 4 | ||||
| -rw-r--r-- | source/slang/slang-ir-sccp.cpp (renamed from source/slang/ir-sccp.cpp) | 8 | ||||
| -rw-r--r-- | source/slang/slang-ir-sccp.h (renamed from source/slang/ir-sccp.h) | 2 | ||||
| -rw-r--r-- | source/slang/slang-ir-serialize.cpp (renamed from source/slang/ir-serialize.cpp) | 8 | ||||
| -rw-r--r-- | source/slang/slang-ir-serialize.h (renamed from source/slang/ir-serialize.h) | 10 | ||||
| -rw-r--r-- | source/slang/slang-ir-specialize-resources.cpp (renamed from source/slang/ir-specialize-resources.cpp) | 10 | ||||
| -rw-r--r-- | source/slang/slang-ir-specialize-resources.h (renamed from source/slang/ir-specialize-resources.h) | 2 | ||||
| -rw-r--r-- | source/slang/slang-ir-specialize.cpp (renamed from source/slang/ir-specialize.cpp) | 10 | ||||
| -rw-r--r-- | source/slang/slang-ir-specialize.h (renamed from source/slang/ir-specialize.h) | 2 | ||||
| -rw-r--r-- | source/slang/slang-ir-ssa.cpp (renamed from source/slang/ir-ssa.cpp) | 10 | ||||
| -rw-r--r-- | source/slang/slang-ir-ssa.h (renamed from source/slang/ir-ssa.h) | 2 | ||||
| -rw-r--r-- | source/slang/slang-ir-union.cpp (renamed from source/slang/ir-union.cpp) | 8 | ||||
| -rw-r--r-- | source/slang/slang-ir-union.h (renamed from source/slang/ir-union.h) | 2 | ||||
| -rw-r--r-- | source/slang/slang-ir-validate.cpp (renamed from source/slang/ir-validate.cpp) | 8 | ||||
| -rw-r--r-- | source/slang/slang-ir-validate.h (renamed from source/slang/ir-validate.h) | 2 | ||||
| -rw-r--r-- | source/slang/slang-ir.cpp (renamed from source/slang/ir.cpp) | 14 | ||||
| -rw-r--r-- | source/slang/slang-ir.h (renamed from source/slang/ir.h) | 14 | ||||
| -rw-r--r-- | source/slang/slang-legalize-types.cpp (renamed from source/slang/legalize-types.cpp) | 8 | ||||
| -rw-r--r-- | source/slang/slang-legalize-types.h (renamed from source/slang/legalize-types.h) | 12 | ||||
| -rw-r--r-- | source/slang/slang-lexer.cpp (renamed from source/slang/lexer.cpp) | 8 | ||||
| -rw-r--r-- | source/slang/slang-lexer.h (renamed from source/slang/lexer.h) | 8 | ||||
| -rw-r--r-- | source/slang/slang-lookup.cpp (renamed from source/slang/lookup.cpp) | 6 | ||||
| -rw-r--r-- | source/slang/slang-lookup.h (renamed from source/slang/lookup.h) | 4 | ||||
| -rw-r--r-- | source/slang/slang-lower-to-ir.cpp (renamed from source/slang/lower-to-ir.cpp) | 24 | ||||
| -rw-r--r-- | source/slang/slang-lower-to-ir.h (renamed from source/slang/lower-to-ir.h) | 8 | ||||
| -rw-r--r-- | source/slang/slang-mangle.cpp (renamed from source/slang/mangle.cpp) | 6 | ||||
| -rw-r--r-- | source/slang/slang-mangle.h (renamed from source/slang/mangle.h) | 6 | ||||
| -rw-r--r-- | source/slang/slang-mangled-lexer.h | 4 | ||||
| -rw-r--r-- | source/slang/slang-modifier-defs.h (renamed from source/slang/modifier-defs.h) | 2 | ||||
| -rw-r--r-- | source/slang/slang-name.cpp (renamed from source/slang/name.cpp) | 4 | ||||
| -rw-r--r-- | source/slang/slang-name.h (renamed from source/slang/name.h) | 4 | ||||
| -rw-r--r-- | source/slang/slang-object-meta-begin.h (renamed from source/slang/object-meta-begin.h) | 2 | ||||
| -rw-r--r-- | source/slang/slang-object-meta-end.h (renamed from source/slang/object-meta-end.h) | 2 | ||||
| -rw-r--r-- | source/slang/slang-options.cpp (renamed from source/slang/options.cpp) | 6 | ||||
| -rw-r--r-- | source/slang/slang-parameter-binding.cpp (renamed from source/slang/parameter-binding.cpp) | 10 | ||||
| -rw-r--r-- | source/slang/slang-parameter-binding.h (renamed from source/slang/parameter-binding.h) | 6 | ||||
| -rw-r--r-- | source/slang/slang-parser.cpp (renamed from source/slang/parser.cpp) | 8 | ||||
| -rw-r--r-- | source/slang/slang-parser.h (renamed from source/slang/parser.h) | 12 | ||||
| -rw-r--r-- | source/slang/slang-preprocessor.cpp (renamed from source/slang/preprocessor.cpp) | 12 | ||||
| -rw-r--r-- | source/slang/slang-preprocessor.h (renamed from source/slang/preprocessor.h) | 4 | ||||
| -rw-r--r-- | source/slang/slang-profile-defs.h (renamed from source/slang/profile-defs.h) | 0 | ||||
| -rw-r--r-- | source/slang/slang-profile.cpp (renamed from source/slang/profile.cpp) | 8 | ||||
| -rw-r--r-- | source/slang/slang-profile.h (renamed from source/slang/profile.h) | 12 | ||||
| -rw-r--r-- | source/slang/slang-reflection.cpp (renamed from source/slang/reflection.cpp) | 10 | ||||
| -rw-r--r-- | source/slang/slang-reflection.h (renamed from source/slang/reflection.h) | 4 | ||||
| -rw-r--r-- | source/slang/slang-source-loc.cpp (renamed from source/slang/source-loc.cpp) | 6 | ||||
| -rw-r--r-- | source/slang/slang-source-loc.h (renamed from source/slang/source-loc.h) | 4 | ||||
| -rw-r--r-- | source/slang/slang-source-stream.h | 4 | ||||
| -rw-r--r-- | source/slang/slang-stdlib.cpp | 6 | ||||
| -rw-r--r-- | source/slang/slang-stmt-defs.h (renamed from source/slang/stmt-defs.h) | 2 | ||||
| -rw-r--r-- | source/slang/slang-syntax-base-defs.h (renamed from source/slang/syntax-base-defs.h) | 2 | ||||
| -rw-r--r-- | source/slang/slang-syntax-defs.h | 10 | ||||
| -rw-r--r-- | source/slang/slang-syntax-visitors.h (renamed from source/slang/syntax-visitors.h) | 10 | ||||
| -rw-r--r-- | source/slang/slang-syntax.cpp (renamed from source/slang/syntax.cpp) | 28 | ||||
| -rw-r--r-- | source/slang/slang-syntax.h (renamed from source/slang/syntax.h) | 38 | ||||
| -rw-r--r-- | source/slang/slang-token-defs.h (renamed from source/slang/token-defs.h) | 2 | ||||
| -rw-r--r-- | source/slang/slang-token.cpp (renamed from source/slang/token.cpp) | 6 | ||||
| -rw-r--r-- | source/slang/slang-token.h (renamed from source/slang/token.h) | 8 | ||||
| -rw-r--r-- | source/slang/slang-type-defs.h (renamed from source/slang/type-defs.h) | 4 | ||||
| -rw-r--r-- | source/slang/slang-type-layout.cpp (renamed from source/slang/type-layout.cpp) | 6 | ||||
| -rw-r--r-- | source/slang/slang-type-layout.h (renamed from source/slang/type-layout.h) | 8 | ||||
| -rw-r--r-- | source/slang/slang-type-system-shared.cpp (renamed from source/slang/type-system-shared.cpp) | 2 | ||||
| -rw-r--r-- | source/slang/slang-type-system-shared.h (renamed from source/slang/type-system-shared.h) | 0 | ||||
| -rw-r--r-- | source/slang/slang-val-defs.h (renamed from source/slang/val-defs.h) | 2 | ||||
| -rw-r--r-- | source/slang/slang-visitor.h (renamed from source/slang/visitor.h) | 222 | ||||
| -rw-r--r-- | source/slang/slang.cpp | 37 | ||||
| -rw-r--r-- | source/slang/slang.vcxproj | 198 | ||||
| -rw-r--r-- | source/slang/slang.vcxproj.filters | 236 | ||||
| -rw-r--r-- | source/slang/syntax-defs.h | 10 | ||||
| -rw-r--r-- | tools/gfx/circular-resource-heap-d3d12.h | 4 | ||||
| -rw-r--r-- | tools/gfx/d3d-util.h | 4 | ||||
| -rw-r--r-- | tools/gfx/descriptor-heap-d3d12.h | 2 | ||||
| -rw-r--r-- | tools/gfx/flag-combiner.h | 2 | ||||
| -rw-r--r-- | tools/gfx/render-gl.cpp | 4 | ||||
| -rw-r--r-- | tools/gfx/render-vk.cpp | 2 | ||||
| -rw-r--r-- | tools/gfx/render.h | 6 | ||||
| -rw-r--r-- | tools/gfx/surface.cpp | 2 | ||||
| -rw-r--r-- | tools/gfx/vk-api.cpp | 2 | ||||
| -rw-r--r-- | tools/gfx/vk-swap-chain.cpp | 2 | ||||
| -rw-r--r-- | tools/gfx/vk-swap-chain.h | 2 | ||||
| -rw-r--r-- | tools/render-test/options.cpp | 2 | ||||
| -rw-r--r-- | tools/render-test/shader-input-layout.cpp | 2 | ||||
| -rw-r--r-- | tools/render-test/shader-input-layout.h | 2 | ||||
| -rw-r--r-- | tools/slang-generate/main.cpp | 4 | ||||
| -rw-r--r-- | tools/slang-test/options.h | 4 | ||||
| -rw-r--r-- | tools/slang-test/slang-test-main.cpp | 2 | ||||
| -rw-r--r-- | tools/slang-test/slangc-tool.cpp | 2 | ||||
| -rw-r--r-- | tools/slang-test/test-context.h | 4 | ||||
| -rw-r--r-- | tools/slang-test/test-reporter.h | 4 | ||||
| -rw-r--r-- | tools/slang-test/unit-test-byte-encode.cpp | 2 | ||||
| -rw-r--r-- | tools/slang-test/unit-test-free-list.cpp | 2 | ||||
| -rw-r--r-- | tools/slang-test/unit-test-memory-arena.cpp | 2 |
181 files changed, 983 insertions, 980 deletions
diff --git a/source/core/basic.h b/source/core/basic.h deleted file mode 100644 index e89d740bf..000000000 --- a/source/core/basic.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef CORE_LIB_BASIC_H -#define CORE_LIB_BASIC_H - -#include "common.h" -#include "slang-math.h" -#include "slang-string.h" -#include "array.h" -#include "list.h" -#include "smart-pointer.h" -#include "exception.h" -#include "dictionary.h" - -#endif
\ No newline at end of file diff --git a/source/core/core.vcxproj b/source/core/core.vcxproj index 0416eaed6..a8e92949f 100644 --- a/source/core/core.vcxproj +++ b/source/core/core.vcxproj @@ -170,59 +170,59 @@ </Lib> </ItemDefinitionGroup> <ItemGroup> - <ClInclude Include="allocator.h" /> - <ClInclude Include="array-view.h" /> - <ClInclude Include="array.h" /> - <ClInclude Include="basic.h" /> - <ClInclude Include="common.h" /> - <ClInclude Include="dictionary.h" /> - <ClInclude Include="exception.h" /> - <ClInclude Include="hash.h" /> - <ClInclude Include="list.h" /> - <ClInclude Include="platform.h" /> - <ClInclude Include="secure-crt.h" /> + <ClInclude Include="slang-allocator.h" /> + <ClInclude Include="slang-array-view.h" /> + <ClInclude Include="slang-array.h" /> + <ClInclude Include="slang-basic.h" /> <ClInclude Include="slang-byte-encode-util.h" /> + <ClInclude Include="slang-common.h" /> + <ClInclude Include="slang-dictionary.h" /> + <ClInclude Include="slang-exception.h" /> <ClInclude Include="slang-free-list.h" /> + <ClInclude Include="slang-hash.h" /> <ClInclude Include="slang-io.h" /> + <ClInclude Include="slang-list.h" /> <ClInclude Include="slang-math.h" /> <ClInclude Include="slang-memory-arena.h" /> <ClInclude Include="slang-object-scope-manager.h" /> + <ClInclude Include="slang-platform.h" /> <ClInclude Include="slang-random-generator.h" /> <ClInclude Include="slang-render-api-util.h" /> + <ClInclude Include="slang-secure-crt.h" /> <ClInclude Include="slang-shared-library.h" /> + <ClInclude Include="slang-smart-pointer.h" /> <ClInclude Include="slang-std-writers.h" /> + <ClInclude Include="slang-stream.h" /> <ClInclude Include="slang-string-slice-pool.h" /> <ClInclude Include="slang-string-util.h" /> <ClInclude Include="slang-string.h" /> <ClInclude Include="slang-test-tool-util.h" /> + <ClInclude Include="slang-text-io.h" /> + <ClInclude Include="slang-token-reader.h" /> + <ClInclude Include="slang-type-traits.h" /> <ClInclude Include="slang-uint-set.h" /> <ClInclude Include="slang-writer.h" /> - <ClInclude Include="smart-pointer.h" /> - <ClInclude Include="stream.h" /> - <ClInclude Include="text-io.h" /> - <ClInclude Include="token-reader.h" /> - <ClInclude Include="type-traits.h" /> </ItemGroup> <ItemGroup> - <ClCompile Include="platform.cpp" /> <ClCompile Include="slang-byte-encode-util.cpp" /> <ClCompile Include="slang-free-list.cpp" /> <ClCompile Include="slang-io.cpp" /> <ClCompile Include="slang-memory-arena.cpp" /> <ClCompile Include="slang-object-scope-manager.cpp" /> + <ClCompile Include="slang-platform.cpp" /> <ClCompile Include="slang-random-generator.cpp" /> <ClCompile Include="slang-render-api-util.cpp" /> <ClCompile Include="slang-shared-library.cpp" /> <ClCompile Include="slang-std-writers.cpp" /> + <ClCompile Include="slang-stream.cpp" /> <ClCompile Include="slang-string-slice-pool.cpp" /> <ClCompile Include="slang-string-util.cpp" /> <ClCompile Include="slang-string.cpp" /> <ClCompile Include="slang-test-tool-util.cpp" /> + <ClCompile Include="slang-text-io.cpp" /> + <ClCompile Include="slang-token-reader.cpp" /> <ClCompile Include="slang-uint-set.cpp" /> <ClCompile Include="slang-writer.cpp" /> - <ClCompile Include="stream.cpp" /> - <ClCompile Include="text-io.cpp" /> - <ClCompile Include="token-reader.cpp" /> </ItemGroup> <ItemGroup> <None Include="core.natvis" /> diff --git a/source/core/core.vcxproj.filters b/source/core/core.vcxproj.filters index 0a0ea93fa..8656ab49b 100644 --- a/source/core/core.vcxproj.filters +++ b/source/core/core.vcxproj.filters @@ -9,46 +9,40 @@ </Filter> </ItemGroup> <ItemGroup> - <ClInclude Include="allocator.h"> + <ClInclude Include="slang-allocator.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="array-view.h"> + <ClInclude Include="slang-array-view.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="array.h"> + <ClInclude Include="slang-array.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="basic.h"> + <ClInclude Include="slang-basic.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="common.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="dictionary.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="exception.h"> + <ClInclude Include="slang-byte-encode-util.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="hash.h"> + <ClInclude Include="slang-common.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="list.h"> + <ClInclude Include="slang-dictionary.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="platform.h"> + <ClInclude Include="slang-exception.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="secure-crt.h"> + <ClInclude Include="slang-free-list.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="slang-byte-encode-util.h"> + <ClInclude Include="slang-hash.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="slang-free-list.h"> + <ClInclude Include="slang-io.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="slang-io.h"> + <ClInclude Include="slang-list.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="slang-math.h"> @@ -60,18 +54,30 @@ <ClInclude Include="slang-object-scope-manager.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="slang-platform.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="slang-random-generator.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="slang-render-api-util.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="slang-secure-crt.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="slang-shared-library.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="slang-smart-pointer.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="slang-std-writers.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="slang-stream.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="slang-string-slice-pool.h"> <Filter>Header Files</Filter> </ClInclude> @@ -84,32 +90,23 @@ <ClInclude Include="slang-test-tool-util.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="slang-uint-set.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="slang-writer.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="smart-pointer.h"> + <ClInclude Include="slang-text-io.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="stream.h"> + <ClInclude Include="slang-token-reader.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="text-io.h"> + <ClInclude Include="slang-type-traits.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="token-reader.h"> + <ClInclude Include="slang-uint-set.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="type-traits.h"> + <ClInclude Include="slang-writer.h"> <Filter>Header Files</Filter> </ClInclude> </ItemGroup> <ItemGroup> - <ClCompile Include="platform.cpp"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="slang-byte-encode-util.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -125,6 +122,9 @@ <ClCompile Include="slang-object-scope-manager.cpp"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="slang-platform.cpp"> + <Filter>Source Files</Filter> + </ClCompile> <ClCompile Include="slang-random-generator.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -137,6 +137,9 @@ <ClCompile Include="slang-std-writers.cpp"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="slang-stream.cpp"> + <Filter>Source Files</Filter> + </ClCompile> <ClCompile Include="slang-string-slice-pool.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -149,19 +152,16 @@ <ClCompile Include="slang-test-tool-util.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="slang-uint-set.cpp"> + <ClCompile Include="slang-text-io.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="slang-writer.cpp"> + <ClCompile Include="slang-token-reader.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="stream.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="text-io.cpp"> + <ClCompile Include="slang-uint-set.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="token-reader.cpp"> + <ClCompile Include="slang-writer.cpp"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> diff --git a/source/core/allocator.h b/source/core/slang-allocator.h index 5832d0b84..481f8810f 100644 --- a/source/core/allocator.h +++ b/source/core/slang-allocator.h @@ -1,5 +1,5 @@ -#ifndef CORE_LIB_ALLOCATOR_H -#define CORE_LIB_ALLOCATOR_H +#ifndef SLANG_CORE_ALLOCATOR_H +#define SLANG_CORE_ALLOCATOR_H #include <stdlib.h> #ifdef _MSC_VER diff --git a/source/core/array-view.h b/source/core/slang-array-view.h index ad9673e2e..8b653f4c7 100644 --- a/source/core/array-view.h +++ b/source/core/slang-array-view.h @@ -1,7 +1,7 @@ -#ifndef CORE_LIB_ARRAY_VIEW_H -#define CORE_LIB_ARRAY_VIEW_H +#ifndef SLANG_CORE_ARRAY_VIEW_H +#define SLANG_CORE_ARRAY_VIEW_H -#include "common.h" +#include "slang-common.h" namespace Slang { diff --git a/source/core/array.h b/source/core/slang-array.h index 2a5fa0aa7..d4bb7386f 100644 --- a/source/core/array.h +++ b/source/core/slang-array.h @@ -1,8 +1,8 @@ -#ifndef CORE_LIB_ARRAY_H -#define CORE_LIB_ARRAY_H +#ifndef SLANG_CORE_ARRAY_H +#define SLANG_CORE_ARRAY_H -#include "exception.h" -#include "array-view.h" +#include "slang-exception.h" +#include "slang-array-view.h" namespace Slang { diff --git a/source/core/slang-basic.h b/source/core/slang-basic.h new file mode 100644 index 000000000..7931749f4 --- /dev/null +++ b/source/core/slang-basic.h @@ -0,0 +1,13 @@ +#ifndef SLANG_CORE_BASIC_H +#define SLANG_CORE_BASIC_H + +#include "slang-common.h" +#include "slang-math.h" +#include "slang-string.h" +#include "slang-array.h" +#include "slang-list.h" +#include "slang-smart-pointer.h" +#include "slang-exception.h" +#include "slang-dictionary.h" + +#endif diff --git a/source/core/slang-byte-encode-util.cpp b/source/core/slang-byte-encode-util.cpp index 47ab824a4..32eb96a29 100644 --- a/source/core/slang-byte-encode-util.cpp +++ b/source/core/slang-byte-encode-util.cpp @@ -1,7 +1,5 @@ #include "slang-byte-encode-util.h" - - namespace Slang { // Descriptions of algorithms here... diff --git a/source/core/slang-byte-encode-util.h b/source/core/slang-byte-encode-util.h index 5936cae60..cb601d522 100644 --- a/source/core/slang-byte-encode-util.h +++ b/source/core/slang-byte-encode-util.h @@ -1,7 +1,7 @@ -#ifndef SLANG_BYTE_ENCODE_UTIL_H -#define SLANG_BYTE_ENCODE_UTIL_H +#ifndef SLANG_CORE_BYTE_ENCODE_UTIL_H +#define SLANG_CORE_BYTE_ENCODE_UTIL_H -#include "list.h" +#include "slang-list.h" namespace Slang { diff --git a/source/core/common.h b/source/core/slang-common.h index 0e5396caf..7d8568642 100644 --- a/source/core/common.h +++ b/source/core/slang-common.h @@ -1,5 +1,5 @@ -#ifndef CORE_LIB_COMMON_H -#define CORE_LIB_COMMON_H +#ifndef SLANG_CORE_COMMON_H +#define SLANG_CORE_COMMON_H #include "../../slang.h" diff --git a/source/core/dictionary.h b/source/core/slang-dictionary.h index 1b3525756..69e8022dd 100644 --- a/source/core/dictionary.h +++ b/source/core/slang-dictionary.h @@ -1,11 +1,12 @@ -#ifndef CORE_LIB_DICTIONARY_H -#define CORE_LIB_DICTIONARY_H -#include "list.h" -#include "common.h" +#ifndef SLANG_CORE_DICTIONARY_H +#define SLANG_CORE_DICTIONARY_H + +#include "slang-list.h" +#include "slang-common.h" #include "slang-uint-set.h" -#include "exception.h" +#include "slang-exception.h" #include "slang-math.h" -#include "hash.h" +#include "slang-hash.h" namespace Slang { diff --git a/source/core/exception.h b/source/core/slang-exception.h index fc7aa48e2..91139e298 100644 --- a/source/core/exception.h +++ b/source/core/slang-exception.h @@ -1,7 +1,7 @@ -#ifndef CORE_LIB_EXCEPTION_H -#define CORE_LIB_EXCEPTION_H +#ifndef SLANG_CORE_EXCEPTION_H +#define SLANG_CORE_EXCEPTION_H -#include "common.h" +#include "slang-common.h" #include "slang-string.h" namespace Slang @@ -134,4 +134,4 @@ namespace Slang }; } -#endif
\ No newline at end of file +#endif diff --git a/source/core/slang-free-list.h b/source/core/slang-free-list.h index 62c2b9d93..ee0158279 100644 --- a/source/core/slang-free-list.h +++ b/source/core/slang-free-list.h @@ -1,9 +1,9 @@ -#ifndef SLANG_FREE_LIST_H -#define SLANG_FREE_LIST_H +#ifndef SLANG_CORE_FREE_LIST_H +#define SLANG_CORE_FREE_LIST_H #include "../../slang.h" -#include "common.h" +#include "slang-common.h" #include <stdlib.h> #include <string.h> diff --git a/source/core/hash.h b/source/core/slang-hash.h index 83e99179b..08a40491c 100644 --- a/source/core/hash.h +++ b/source/core/slang-hash.h @@ -1,5 +1,5 @@ -#ifndef CORELIB_HASH_H -#define CORELIB_HASH_H +#ifndef SLANG_CORE_HASH_H +#define SLANG_CORE_HASH_H #include "slang-math.h" #include <string.h> diff --git a/source/core/slang-io.cpp b/source/core/slang-io.cpp index 82a2e5a35..ae2520a78 100644 --- a/source/core/slang-io.cpp +++ b/source/core/slang-io.cpp @@ -1,5 +1,5 @@ #include "slang-io.h" -#include "exception.h" +#include "slang-exception.h" #include "../../slang-com-helper.h" diff --git a/source/core/slang-io.h b/source/core/slang-io.h index 9df8d8d57..64ec11c5a 100644 --- a/source/core/slang-io.h +++ b/source/core/slang-io.h @@ -1,10 +1,10 @@ -#ifndef CORE_LIB_IO_H -#define CORE_LIB_IO_H +#ifndef SLANG_CORE_IO_H +#define SLANG_CORE_IO_H #include "slang-string.h" -#include "stream.h" -#include "text-io.h" -#include "secure-crt.h" +#include "slang-stream.h" +#include "slang-text-io.h" +#include "slang-secure-crt.h" namespace Slang { diff --git a/source/core/list.h b/source/core/slang-list.h index 7ba313305..0affbfd66 100644 --- a/source/core/list.h +++ b/source/core/slang-list.h @@ -1,11 +1,11 @@ -#ifndef FUNDAMENTAL_LIB_LIST_H -#define FUNDAMENTAL_LIB_LIST_H +#ifndef SLANG_CORE_LIST_H +#define SLANG_CORE_LIST_H #include "../../slang.h" -#include "allocator.h" +#include "slang-allocator.h" #include "slang-math.h" -#include "array-view.h" +#include "slang-array-view.h" #include <algorithm> #include <new> diff --git a/source/core/slang-math.h b/source/core/slang-math.h index a245e2d2c..0daad0d5a 100644 --- a/source/core/slang-math.h +++ b/source/core/slang-math.h @@ -1,5 +1,5 @@ -#ifndef CORE_LIB_MATH_H -#define CORE_LIB_MATH_H +#ifndef SLANG_CORE_MATH_H +#define SLANG_CORE_MATH_H #include <math.h> diff --git a/source/core/slang-memory-arena.h b/source/core/slang-memory-arena.h index b9066e198..75744710f 100644 --- a/source/core/slang-memory-arena.h +++ b/source/core/slang-memory-arena.h @@ -1,5 +1,5 @@ -#ifndef SLANG_MEMORY_ARENA_H -#define SLANG_MEMORY_ARENA_H +#ifndef SLANG_CORE_MEMORY_ARENA_H +#define SLANG_CORE_MEMORY_ARENA_H #include "../../slang.h" diff --git a/source/core/slang-object-scope-manager.h b/source/core/slang-object-scope-manager.h index 660a7cace..9930e46ea 100644 --- a/source/core/slang-object-scope-manager.h +++ b/source/core/slang-object-scope-manager.h @@ -1,8 +1,8 @@ -#ifndef SLANG_OBJECT_SCOPE_MANAGER_H -#define SLANG_OBJECT_SCOPE_MANAGER_H +#ifndef SLANG_CORE_OBJECT_SCOPE_MANAGER_H +#define SLANG_CORE_OBJECT_SCOPE_MANAGER_H -#include "smart-pointer.h" -#include "list.h" +#include "slang-smart-pointer.h" +#include "slang-list.h" namespace Slang { diff --git a/source/core/platform.cpp b/source/core/slang-platform.cpp index 0deec8ed6..1cb2bc56e 100644 --- a/source/core/platform.cpp +++ b/source/core/slang-platform.cpp @@ -1,7 +1,7 @@ -// platform.cpp -#include "platform.h" +// slang-platform.cpp +#include "slang-platform.h" -#include "common.h" +#include "slang-common.h" #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN diff --git a/source/core/platform.h b/source/core/slang-platform.h index 544ae8c16..e33c5599d 100644 --- a/source/core/platform.h +++ b/source/core/slang-platform.h @@ -1,6 +1,6 @@ -// platform.h -#ifndef SLANG_CORE_PLATFORM_H_INCLUDED -#define SLANG_CORE_PLATFORM_H_INCLUDED +// slang-platform.h +#ifndef SLANG_CORE_PLATFORM_H +#define SLANG_CORE_PLATFORM_H #include "../../slang.h" #include "../core/slang-string.h" diff --git a/source/core/slang-random-generator.h b/source/core/slang-random-generator.h index cc25aadf3..8b4d1759b 100644 --- a/source/core/slang-random-generator.h +++ b/source/core/slang-random-generator.h @@ -1,12 +1,12 @@ -#ifndef SLANG_RANDOM_GENERATOR_H -#define SLANG_RANDOM_GENERATOR_H +#ifndef SLANG_CORE_RANDOM_GENERATOR_H +#define SLANG_CORE_RANDOM_GENERATOR_H #include "../../slang.h" #include <stdlib.h> #include <string.h> -#include "smart-pointer.h" +#include "slang-smart-pointer.h" namespace Slang { diff --git a/source/core/slang-render-api-util.cpp b/source/core/slang-render-api-util.cpp index 05def0fe3..3df971219 100644 --- a/source/core/slang-render-api-util.cpp +++ b/source/core/slang-render-api-util.cpp @@ -3,10 +3,10 @@ #include "../../slang.h" -#include "../../source/core/list.h" -#include "../../source/core/slang-string-util.h" +#include "slang-list.h" +#include "slang-string-util.h" -#include "platform.h" +#include "slang-platform.h" namespace Slang { diff --git a/source/core/slang-render-api-util.h b/source/core/slang-render-api-util.h index 42e88a6ac..fbdd3930c 100644 --- a/source/core/slang-render-api-util.h +++ b/source/core/slang-render-api-util.h @@ -1,5 +1,5 @@ -#ifndef SLANG_RENDER_API_UTIL_H -#define SLANG_RENDER_API_UTIL_H +#ifndef SLANG_CORE_RENDER_API_UTIL_H +#define SLANG_CORE_RENDER_API_UTIL_H #include "../../source/core/slang-string.h" diff --git a/source/core/secure-crt.h b/source/core/slang-secure-crt.h index 52a0d4870..991fe939e 100644 --- a/source/core/secure-crt.h +++ b/source/core/slang-secure-crt.h @@ -1,6 +1,6 @@ #ifndef _MSC_VER -#ifndef CORE_LIB_SECURE_CRT_H -#define CORE_LIB_SECURE_CRT_H +#ifndef SLANG_CORE_SECURE_CRT_H +#define SLANG_CORE_SECURE_CRT_H #include <stdarg.h> #include <stdio.h> #include <stdlib.h> diff --git a/source/core/slang-shared-library.cpp b/source/core/slang-shared-library.cpp index 20d457840..009abf921 100644 --- a/source/core/slang-shared-library.cpp +++ b/source/core/slang-shared-library.cpp @@ -1,8 +1,9 @@ #include "slang-shared-library.h" #include "../../slang-com-ptr.h" -#include "../core/slang-io.h" -#include "../core/slang-string-util.h" + +#include "slang-io.h" +#include "slang-string-util.h" namespace Slang { diff --git a/source/core/slang-shared-library.h b/source/core/slang-shared-library.h index 62d15b6b4..5a4eb7229 100644 --- a/source/core/slang-shared-library.h +++ b/source/core/slang-shared-library.h @@ -1,13 +1,13 @@ -#ifndef SLANG_SHARED_LIBRARY_H_INCLUDED -#define SLANG_SHARED_LIBRARY_H_INCLUDED +#ifndef SLANG_CORE_SHARED_LIBRARY_H +#define SLANG_CORE_SHARED_LIBRARY_H #include "../../slang.h" #include "../../slang-com-helper.h" #include "../../slang-com-ptr.h" -#include "../core/platform.h" -#include "../core/common.h" -#include "../core/dictionary.h" +#include "../core/slang-platform.h" +#include "../core/slang-common.h" +#include "../core/slang-dictionary.h" namespace Slang { @@ -119,4 +119,4 @@ public: } -#endif // SLANG_SHARED_LIBRARY_H_INCLUDED
\ No newline at end of file +#endif // SLANG_SHARED_LIBRARY_H_INCLUDED diff --git a/source/core/smart-pointer.h b/source/core/slang-smart-pointer.h index aa5c06e02..bae30de37 100644 --- a/source/core/smart-pointer.h +++ b/source/core/slang-smart-pointer.h @@ -1,9 +1,9 @@ -#ifndef FUNDAMENTAL_LIB_SMART_POINTER_H -#define FUNDAMENTAL_LIB_SMART_POINTER_H +#ifndef SLANG_CORE_SMART_POINTER_H +#define SLANG_CORE_SMART_POINTER_H -#include "common.h" -#include "hash.h" -#include "type-traits.h" +#include "slang-common.h" +#include "slang-hash.h" +#include "slang-type-traits.h" #include "../../slang.h" diff --git a/source/core/slang-std-writers.h b/source/core/slang-std-writers.h index b35d3d037..8ecb89227 100644 --- a/source/core/slang-std-writers.h +++ b/source/core/slang-std-writers.h @@ -1,5 +1,5 @@ -#ifndef SLANG_STD_WRITERS_H -#define SLANG_STD_WRITERS_H +#ifndef SLANG_CORE_STD_WRITERS_H +#define SLANG_CORE_STD_WRITERS_H #include "slang-writer.h" #include "../../slang-com-ptr.h" diff --git a/source/core/stream.cpp b/source/core/slang-stream.cpp index de0a8b8f3..ee194c451 100644 --- a/source/core/stream.cpp +++ b/source/core/slang-stream.cpp @@ -1,4 +1,4 @@ -#include "stream.h" +#include "slang-stream.h" #ifdef _WIN32 #include <share.h> #endif diff --git a/source/core/stream.h b/source/core/slang-stream.h index 618aadbd4..67e04fa6a 100644 --- a/source/core/stream.h +++ b/source/core/slang-stream.h @@ -1,7 +1,7 @@ -#ifndef CORE_LIB_STREAM_H -#define CORE_LIB_STREAM_H +#ifndef SLANG_CORE_STREAM_H +#define SLANG_CORE_STREAM_H -#include "basic.h" +#include "slang-basic.h" namespace Slang { diff --git a/source/core/slang-string-slice-pool.h b/source/core/slang-string-slice-pool.h index cf8f63c81..4d5f91e37 100644 --- a/source/core/slang-string-slice-pool.h +++ b/source/core/slang-string-slice-pool.h @@ -1,11 +1,11 @@ -#ifndef SLANG_STRING_SLICE_POOL_H -#define SLANG_STRING_SLICE_POOL_H +#ifndef SLANG_CORE_STRING_SLICE_POOL_H +#define SLANG_CORE_STRING_SLICE_POOL_H #include "slang-string.h" -#include "list.h" +#include "slang-list.h" #include "slang-memory-arena.h" -#include "dictionary.h" +#include "slang-dictionary.h" namespace Slang { diff --git a/source/core/slang-string-util.h b/source/core/slang-string-util.h index 40fda31c4..fcae23bb3 100644 --- a/source/core/slang-string-util.h +++ b/source/core/slang-string-util.h @@ -1,8 +1,8 @@ -#ifndef SLANG_STRING_UTIL_H -#define SLANG_STRING_UTIL_H +#ifndef SLANG_CORE_STRING_UTIL_H +#define SLANG_CORE_STRING_UTIL_H #include "slang-string.h" -#include "list.h" +#include "slang-list.h" #include <stdarg.h> diff --git a/source/core/slang-string.cpp b/source/core/slang-string.cpp index 9a908c93e..64b8e4dc1 100644 --- a/source/core/slang-string.cpp +++ b/source/core/slang-string.cpp @@ -1,5 +1,5 @@ #include "slang-string.h" -#include "text-io.h" +#include "slang-text-io.h" namespace Slang { diff --git a/source/core/slang-string.h b/source/core/slang-string.h index 82eda74ac..1cd9e5413 100644 --- a/source/core/slang-string.h +++ b/source/core/slang-string.h @@ -1,14 +1,14 @@ -#ifndef FUNDAMENTAL_LIB_STRING_H -#define FUNDAMENTAL_LIB_STRING_H +#ifndef SLANG_CORE_STRING_H +#define SLANG_CORE_STRING_H #include <string.h> #include <cstdlib> #include <stdio.h> -#include "smart-pointer.h" -#include "common.h" -#include "hash.h" -#include "secure-crt.h" +#include "slang-smart-pointer.h" +#include "slang-common.h" +#include "slang-hash.h" +#include "slang-secure-crt.h" #include <new> diff --git a/source/core/slang-test-tool-util.h b/source/core/slang-test-tool-util.h index 3ec655cad..a5d7541ec 100644 --- a/source/core/slang-test-tool-util.h +++ b/source/core/slang-test-tool-util.h @@ -1,5 +1,5 @@ -#ifndef SLANG_TEST_TOOL_UTIL_H -#define SLANG_TEST_TOOL_UTIL_H +#ifndef SLANG_CORE_TEST_TOOL_UTIL_H +#define SLANG_CORE_TEST_TOOL_UTIL_H #include "slang-std-writers.h" diff --git a/source/core/text-io.cpp b/source/core/slang-text-io.cpp index 1f6b44c92..18039e41b 100644 --- a/source/core/text-io.cpp +++ b/source/core/slang-text-io.cpp @@ -1,4 +1,4 @@ -#include "text-io.h" +#include "slang-text-io.h" #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN #define NOMINMAX diff --git a/source/core/text-io.h b/source/core/slang-text-io.h index 949150777..ac9a4f5dc 100644 --- a/source/core/text-io.h +++ b/source/core/slang-text-io.h @@ -1,8 +1,8 @@ -#ifndef CORE_LIB_TEXT_IO_H -#define CORE_LIB_TEXT_IO_H +#ifndef SLANG_CORE_TEXT_IO_H +#define SLANG_CORE_TEXT_IO_H -#include "secure-crt.h" -#include "stream.h" +#include "slang-secure-crt.h" +#include "slang-stream.h" namespace Slang { diff --git a/source/core/token-reader.cpp b/source/core/slang-token-reader.cpp index ea40c9ed9..a15dcda9c 100644 --- a/source/core/token-reader.cpp +++ b/source/core/slang-token-reader.cpp @@ -1,4 +1,4 @@ -#include "token-reader.h" +#include "slang-token-reader.h" namespace Slang { diff --git a/source/core/token-reader.h b/source/core/slang-token-reader.h index a5b9b3694..f8a455452 100644 --- a/source/core/token-reader.h +++ b/source/core/slang-token-reader.h @@ -1,10 +1,12 @@ -#ifndef CORE_TOKEN_READER_H -#define CORE_TOKEN_READER_H +#ifndef SLANG_CORE_TOKEN_READER_H +#define SLANG_CORE_TOKEN_READER_H -#include "basic.h" +#include "slang-basic.h" namespace Slang { + /* NOTE! This TokenReader is NOT used by the main slang compiler !*/ + enum class TokenType { EndOfFile = -1, diff --git a/source/core/type-traits.h b/source/core/slang-type-traits.h index 804b4d3fe..ccd1fb29c 100644 --- a/source/core/type-traits.h +++ b/source/core/slang-type-traits.h @@ -1,5 +1,5 @@ -#ifndef CORELIB_TYPETRAITS_H -#define CORELIB_TYPETRAITS_H +#ifndef SLANG_CORE_TYPE_TRAITS_H +#define SLANG_CORE_TYPE_TRAITS_H namespace Slang { diff --git a/source/core/slang-uint-set.h b/source/core/slang-uint-set.h index 25f0c9269..77930ba0d 100644 --- a/source/core/slang-uint-set.h +++ b/source/core/slang-uint-set.h @@ -1,9 +1,9 @@ -#ifndef SLANG_UINT_SET_H -#define SLANG_UINT_SET_H +#ifndef SLANG_CORE_UINT_SET_H +#define SLANG_CORE_UINT_SET_H -#include "list.h" +#include "slang-list.h" #include "slang-math.h" -#include "common.h" +#include "slang-common.h" #include <memory.h> diff --git a/source/core/slang-writer.cpp b/source/core/slang-writer.cpp index 2c6f99bf9..5b643fff8 100644 --- a/source/core/slang-writer.cpp +++ b/source/core/slang-writer.cpp @@ -1,6 +1,6 @@ #include "slang-writer.h" -#include "platform.h" +#include "slang-platform.h" #include "slang-string-util.h" // Includes to allow us to control console diff --git a/source/core/slang-writer.h b/source/core/slang-writer.h index 463450ac9..6e26d6750 100644 --- a/source/core/slang-writer.h +++ b/source/core/slang-writer.h @@ -1,10 +1,10 @@ -#ifndef SLANG_WRITER_H -#define SLANG_WRITER_H +#ifndef SLANG_CORE_WRITER_H +#define SLANG_CORE_WRITER_H #include "slang-string.h" #include "../../slang-com-helper.h" -#include "../../source/core/list.h" +#include "slang-list.h" namespace Slang { diff --git a/source/slang/slang-c-like-source-emitter.cpp b/source/slang/slang-c-like-source-emitter.cpp index 917779b6d..dacb5e9b5 100644 --- a/source/slang/slang-c-like-source-emitter.cpp +++ b/source/slang/slang-c-like-source-emitter.cpp @@ -2,25 +2,25 @@ #include "slang-c-like-source-emitter.h" #include "../core/slang-writer.h" -#include "ir-bind-existentials.h" -#include "ir-dce.h" -#include "ir-entry-point-uniforms.h" -#include "ir-glsl-legalize.h" - -#include "ir-link.h" -#include "ir-restructure-scoping.h" -#include "ir-specialize.h" -#include "ir-specialize-resources.h" -#include "ir-ssa.h" -#include "ir-union.h" -#include "ir-validate.h" -#include "legalize-types.h" -#include "lower-to-ir.h" -#include "mangle.h" -#include "name.h" -#include "syntax.h" -#include "type-layout.h" -#include "visitor.h" +#include "slang-ir-bind-existentials.h" +#include "slang-ir-dce.h" +#include "slang-ir-entry-point-uniforms.h" +#include "slang-ir-glsl-legalize.h" + +#include "slang-ir-link.h" +#include "slang-ir-restructure-scoping.h" +#include "slang-ir-specialize.h" +#include "slang-ir-specialize-resources.h" +#include "slang-ir-ssa.h" +#include "slang-ir-union.h" +#include "slang-ir-validate.h" +#include "slang-legalize-types.h" +#include "slang-lower-to-ir.h" +#include "slang-mangle.h" +#include "slang-name.h" +#include "slang-syntax.h" +#include "slang-type-layout.h" +#include "slang-visitor.h" #include "slang-source-stream.h" #include "slang-emit-context.h" diff --git a/source/slang/slang-c-like-source-emitter.h b/source/slang/slang-c-like-source-emitter.h index 3c8f3dbef..4fcbb0b1c 100644 --- a/source/slang/slang-c-like-source-emitter.h +++ b/source/slang/slang-c-like-source-emitter.h @@ -2,17 +2,17 @@ #ifndef SLANG_C_LIKE_SOURCE_EMITTER_H_INCLUDED #define SLANG_C_LIKE_SOURCE_EMITTER_H_INCLUDED -#include "../core/basic.h" +#include "../core/slang-basic.h" -#include "compiler.h" +#include "slang-compiler.h" #include "slang-emit-context.h" #include "slang-extension-usage-tracker.h" #include "slang-emit-precedence.h" -#include "ir.h" -#include "ir-insts.h" -#include "ir-restructure.h" +#include "slang-ir.h" +#include "slang-ir-insts.h" +#include "slang-ir-restructure.h" namespace Slang { diff --git a/source/slang/check.cpp b/source/slang/slang-check.cpp index d51785112..90947cf54 100644 --- a/source/slang/check.cpp +++ b/source/slang/slang-check.cpp @@ -1,10 +1,10 @@ -#include "syntax-visitors.h" +#include "slang-syntax-visitors.h" -#include "lookup.h" -#include "compiler.h" -#include "visitor.h" +#include "slang-lookup.h" +#include "slang-compiler.h" +#include "slang-visitor.h" -#include "../core/secure-crt.h" +#include "../core/slang-secure-crt.h" #include <assert.h> namespace Slang diff --git a/source/slang/check.h b/source/slang/slang-check.h index 1f378ec7b..e243d572b 100644 --- a/source/slang/check.h +++ b/source/slang/slang-check.h @@ -1,7 +1,7 @@ -// check.h +// slang-check.h #pragma once namespace Slang { bool isGlobalShaderParameter(VarDeclBase* decl); -}
\ No newline at end of file +} diff --git a/source/slang/compiler.cpp b/source/slang/slang-compiler.cpp index 22c1d4cd8..94f350ce3 100644 --- a/source/slang/compiler.cpp +++ b/source/slang/slang-compiler.cpp @@ -1,20 +1,20 @@ // Compiler.cpp : Defines the entry point for the console application. // -#include "../core/basic.h" -#include "../core/platform.h" +#include "../core/slang-basic.h" +#include "../core/slang-platform.h" #include "../core/slang-io.h" #include "../core/slang-string-util.h" -#include "compiler.h" -#include "lexer.h" -#include "lower-to-ir.h" -#include "parameter-binding.h" -#include "parser.h" -#include "preprocessor.h" -#include "syntax-visitors.h" -#include "type-layout.h" -#include "reflection.h" -#include "emit.h" +#include "slang-compiler.h" +#include "slang-lexer.h" +#include "slang-lower-to-ir.h" +#include "slang-parameter-binding.h" +#include "slang-parser.h" +#include "slang-preprocessor.h" +#include "slang-syntax-visitors.h" +#include "slang-type-layout.h" +#include "slang-reflection.h" +#include "slang-emit.h" // Enable calling through to `fxc` or `dxc` to // generate code on Windows. @@ -248,7 +248,7 @@ namespace Slang { #define PROFILE(TAG, NAME, STAGE, VERSION) if(strcmp(name, #NAME) == 0) return Profile::TAG; #define PROFILE_ALIAS(TAG, DEF, NAME) if(strcmp(name, #NAME) == 0) return Profile::TAG; - #include "profile-defs.h" + #include "slang-profile-defs.h" return Profile::Unknown; } @@ -262,7 +262,7 @@ namespace Slang #define PROFILE(TAG, NAME, STAGE, VERSION) case Profile::TAG: return #NAME; #define PROFILE_ALIAS(TAG, DEF, NAME) /* empty */ - #include "profile-defs.h" + #include "slang-profile-defs.h" } } @@ -280,7 +280,7 @@ namespace Slang #define PROFILE_STAGE_ALIAS(ID, NAME, VAL) \ { #NAME, Stage::ID }, - #include "profile-defs.h" + #include "slang-profile-defs.h" }; for(auto entry : kStages) diff --git a/source/slang/compiler.h b/source/slang/slang-compiler.h index 5d9e47aee..9ea2f520c 100644 --- a/source/slang/compiler.h +++ b/source/slang/slang-compiler.h @@ -1,15 +1,15 @@ #ifndef SLANG_COMPILER_H_INCLUDED #define SLANG_COMPILER_H_INCLUDED -#include "../core/basic.h" +#include "../core/slang-basic.h" #include "../core/slang-shared-library.h" #include "../../slang-com-ptr.h" -#include "diagnostics.h" -#include "name.h" -#include "profile.h" -#include "syntax.h" +#include "slang-diagnostics.h" +#include "slang-name.h" +#include "slang-profile.h" +#include "slang-syntax.h" #include "../../slang.h" diff --git a/source/slang/decl-defs.h b/source/slang/slang-decl-defs.h index 10dcefe19..04c733aac 100644 --- a/source/slang/decl-defs.h +++ b/source/slang/slang-decl-defs.h @@ -1,4 +1,4 @@ -// decl-defs.h +// slang-decl-defs.h // Syntax class definitions for declarations. diff --git a/source/slang/diagnostic-defs.h b/source/slang/slang-diagnostic-defs.h index 59d840997..59d840997 100644 --- a/source/slang/diagnostic-defs.h +++ b/source/slang/slang-diagnostic-defs.h diff --git a/source/slang/diagnostics.cpp b/source/slang/slang-diagnostics.cpp index a947e7369..4aabd3ab9 100644 --- a/source/slang/diagnostics.cpp +++ b/source/slang/slang-diagnostics.cpp @@ -1,9 +1,9 @@ -// diagnostics.cpp -#include "diagnostics.h" +// slang-diagnostics.cpp +#include "slang-diagnostics.h" -#include "compiler.h" -#include "name.h" -#include "syntax.h" +#include "slang-compiler.h" +#include "slang-name.h" +#include "slang-syntax.h" #include <assert.h> @@ -343,7 +343,7 @@ void DiagnosticSink::diagnoseRaw( namespace Diagnostics { #define DIAGNOSTIC(id, severity, name, messageFormat) const DiagnosticInfo name = { id, Severity::severity, messageFormat }; -#include "diagnostic-defs.h" +#include "slang-diagnostic-defs.h" } diff --git a/source/slang/diagnostics.h b/source/slang/slang-diagnostics.h index 8e5ba809b..e1b9846d7 100644 --- a/source/slang/diagnostics.h +++ b/source/slang/slang-diagnostics.h @@ -1,11 +1,11 @@ #ifndef RASTER_RENDERER_COMPILE_ERROR_H #define RASTER_RENDERER_COMPILE_ERROR_H -#include "../core/basic.h" +#include "../core/slang-basic.h" #include "../core/slang-writer.h" -#include "source-loc.h" -#include "token.h" +#include "slang-source-loc.h" +#include "slang-token.h" #include "../../slang.h" @@ -256,7 +256,7 @@ namespace Slang namespace Diagnostics { #define DIAGNOSTIC(id, severity, name, messageFormat) extern const DiagnosticInfo name; -#include "diagnostic-defs.h" +#include "slang-diagnostic-defs.h" } } diff --git a/source/slang/dxc-support.cpp b/source/slang/slang-dxc-support.cpp index b6eaf8aa9..b4bc77fe5 100644 --- a/source/slang/dxc-support.cpp +++ b/source/slang/slang-dxc-support.cpp @@ -1,5 +1,5 @@ -// dxc-support.cpp -#include "compiler.h" +// slang-dxc-support.cpp +#include "slang-compiler.h" // This file implements support for invoking the `dxcompiler` // library to translate HLSL to DXIL. @@ -24,7 +24,7 @@ #undef WIN32_LEAN_AND_MEAN #undef NOMINMAX -#include "../core/platform.h" +#include "../core/slang-platform.h" namespace Slang { diff --git a/source/slang/slang-emit-context.h b/source/slang/slang-emit-context.h index 75e65feee..337d0434f 100644 --- a/source/slang/slang-emit-context.h +++ b/source/slang/slang-emit-context.h @@ -2,10 +2,10 @@ #ifndef SLANG_EMIT_CONTEXT_H_INCLUDED #define SLANG_EMIT_CONTEXT_H_INCLUDED -#include "../core/basic.h" +#include "../core/slang-basic.h" -#include "compiler.h" -#include "type-layout.h" +#include "slang-compiler.h" +#include "slang-type-layout.h" #include "slang-source-stream.h" #include "slang-extension-usage-tracker.h" diff --git a/source/slang/slang-emit-precedence.h b/source/slang/slang-emit-precedence.h index 30783f685..8d8a146c6 100644 --- a/source/slang/slang-emit-precedence.h +++ b/source/slang/slang-emit-precedence.h @@ -2,7 +2,7 @@ #ifndef SLANG_EMIT_PRECEDENCE_H_INCLUDED #define SLANG_EMIT_PRECEDENCE_H_INCLUDED -#include "../core/basic.h" +#include "../core/slang-basic.h" namespace Slang { diff --git a/source/slang/emit.cpp b/source/slang/slang-emit.cpp index d90415d89..67b57660a 100644 --- a/source/slang/emit.cpp +++ b/source/slang/slang-emit.cpp @@ -1,27 +1,27 @@ -// emit.cpp -#include "emit.h" +// slang-emit.cpp +#include "slang-emit.h" #include "../core/slang-writer.h" -#include "ir-bind-existentials.h" -#include "ir-dce.h" -#include "ir-entry-point-uniforms.h" -#include "ir-glsl-legalize.h" -#include "ir-insts.h" -#include "ir-link.h" -#include "ir-restructure.h" -#include "ir-restructure-scoping.h" -#include "ir-specialize.h" -#include "ir-specialize-resources.h" -#include "ir-ssa.h" -#include "ir-union.h" -#include "ir-validate.h" -#include "legalize-types.h" -#include "lower-to-ir.h" -#include "mangle.h" -#include "name.h" -#include "syntax.h" -#include "type-layout.h" -#include "visitor.h" +#include "slang-ir-bind-existentials.h" +#include "slang-ir-dce.h" +#include "slang-ir-entry-point-uniforms.h" +#include "slang-ir-glsl-legalize.h" +#include "slang-ir-insts.h" +#include "slang-ir-link.h" +#include "slang-ir-restructure.h" +#include "slang-ir-restructure-scoping.h" +#include "slang-ir-specialize.h" +#include "slang-ir-specialize-resources.h" +#include "slang-ir-ssa.h" +#include "slang-ir-union.h" +#include "slang-ir-validate.h" +#include "slang-legalize-types.h" +#include "slang-lower-to-ir.h" +#include "slang-mangle.h" +#include "slang-name.h" +#include "slang-syntax.h" +#include "slang-type-layout.h" +#include "slang-visitor.h" #include "slang-source-stream.h" #include "slang-emit-context.h" diff --git a/source/slang/emit.h b/source/slang/slang-emit.h index dc9300025..c0981a5e4 100644 --- a/source/slang/emit.h +++ b/source/slang/slang-emit.h @@ -1,10 +1,10 @@ -// Emit.h +// slang-emit.h #ifndef SLANG_EMIT_H_INCLUDED #define SLANG_EMIT_H_INCLUDED -#include "../core/basic.h" +#include "../core/slang-basic.h" -#include "compiler.h" +#include "slang-compiler.h" namespace Slang { diff --git a/source/slang/expr-defs.h b/source/slang/slang-expr-defs.h index 8afa93fbd..6cd893302 100644 --- a/source/slang/expr-defs.h +++ b/source/slang/slang-expr-defs.h @@ -1,4 +1,4 @@ -// expr-defs.h +// slang-expr-defs.h // Syntax class definitions for expressions. @@ -203,4 +203,4 @@ SYNTAX_CLASS(TaggedUnionTypeExpr, Expr) RAW( List<TypeExp> caseTypes; ) -END_SYNTAX_CLASS()
\ No newline at end of file +END_SYNTAX_CLASS() diff --git a/source/slang/slang-extension-usage-tracker.h b/source/slang/slang-extension-usage-tracker.h index 32002261d..d17a7a6a1 100644 --- a/source/slang/slang-extension-usage-tracker.h +++ b/source/slang/slang-extension-usage-tracker.h @@ -2,9 +2,9 @@ #ifndef SLANG_EXTENSION_USAGE_TRACKER_H_INCLUDED #define SLANG_EXTENSION_USAGE_TRACKER_H_INCLUDED -#include "../core/basic.h" +#include "../core/slang-basic.h" -#include "compiler.h" +#include "slang-compiler.h" namespace Slang { diff --git a/source/slang/slang-file-system.cpp b/source/slang/slang-file-system.cpp index 9cd2ee035..f8c423e84 100644 --- a/source/slang/slang-file-system.cpp +++ b/source/slang/slang-file-system.cpp @@ -4,7 +4,7 @@ #include "../core/slang-io.h" #include "../core/slang-string-util.h" -#include "compiler.h" +#include "slang-compiler.h" namespace Slang { diff --git a/source/slang/slang-file-system.h b/source/slang/slang-file-system.h index a9e92dc1e..e89bf45db 100644 --- a/source/slang/slang-file-system.h +++ b/source/slang/slang-file-system.h @@ -6,7 +6,7 @@ #include "../../slang-com-ptr.h" #include "../core/slang-string-util.h" -#include "../core/dictionary.h" +#include "../core/slang-dictionary.h" namespace Slang { diff --git a/source/slang/image-format-defs.h b/source/slang/slang-image-format-defs.h index bbd60456d..aa6ffec50 100644 --- a/source/slang/image-format-defs.h +++ b/source/slang/slang-image-format-defs.h @@ -1,4 +1,4 @@ -// image-format-defs.h +// slang-image-format-defs.h #ifndef FORMAT #error Must define FORMAT macro before including image-format-defs.h #endif diff --git a/source/slang/ir-bind-existentials.cpp b/source/slang/slang-ir-bind-existentials.cpp index f0c02dd67..e426e6e92 100644 --- a/source/slang/ir-bind-existentials.cpp +++ b/source/slang/slang-ir-bind-existentials.cpp @@ -1,8 +1,8 @@ -// ir-bind-existentials.cpp -#include "ir-bind-existentials.h" +// slang-ir-bind-existentials.cpp +#include "slang-ir-bind-existentials.h" -#include "ir.h" -#include "ir-insts.h" +#include "slang-ir.h" +#include "slang-ir-insts.h" namespace Slang { @@ -33,7 +33,7 @@ namespace Slang // // global_param p : IFoo; // -// And if the user tries to specialie `p` to type `Bar`, and a witness +// And if the user tries to specialize `p` to type `Bar`, and a witness // table `bar_is_ifoo`, we've have: // // bindGlobalExistentialSlots(Bar, bar_is_ifoo); diff --git a/source/slang/ir-bind-existentials.h b/source/slang/slang-ir-bind-existentials.h index c7fca3bb3..4c32ee8c2 100644 --- a/source/slang/ir-bind-existentials.h +++ b/source/slang/slang-ir-bind-existentials.h @@ -1,4 +1,4 @@ -// ir-bind-existentials.h +// slang-ir-bind-existentials.h #pragma once namespace Slang diff --git a/source/slang/ir-clone.cpp b/source/slang/slang-ir-clone.cpp index d26b470d6..df0555f9b 100644 --- a/source/slang/ir-clone.cpp +++ b/source/slang/slang-ir-clone.cpp @@ -1,8 +1,8 @@ -// ir-clone.cpp -#include "ir-clone.h" +// slang-ir-clone.cpp +#include "slang-ir-clone.h" -#include "ir.h" -#include "ir-insts.h" +#include "slang-ir.h" +#include "slang-ir-insts.h" namespace Slang { diff --git a/source/slang/ir-clone.h b/source/slang/slang-ir-clone.h index bafbfa69d..d2d3b1f55 100644 --- a/source/slang/ir-clone.h +++ b/source/slang/slang-ir-clone.h @@ -1,9 +1,9 @@ -// ir-clone.h +// slang-ir-clone.h #pragma once -#include "../core/dictionary.h" +#include "../core/slang-dictionary.h" -#include "ir.h" +#include "slang-ir.h" namespace Slang { @@ -12,7 +12,7 @@ struct IRInst; struct SharedIRBuilder; // This file provides an interface to simplify the task of -// correctling "cloning" IR code, whether individual +// correcting "cloning" IR code, whether individual // instructions, or whole functions. /// An environment for mapping existing values to their cloned replacements. diff --git a/source/slang/ir-constexpr.cpp b/source/slang/slang-ir-constexpr.cpp index c56a15663..f041d7ae6 100644 --- a/source/slang/ir-constexpr.cpp +++ b/source/slang/slang-ir-constexpr.cpp @@ -1,8 +1,8 @@ -// ir-constexpr.cpp -#include "ir-constexpr.h" +// slang-ir-constexpr.cpp +#include "slang-ir-constexpr.h" -#include "ir.h" -#include "ir-insts.h" +#include "slang-ir.h" +#include "slang-ir-insts.h" namespace Slang { diff --git a/source/slang/ir-constexpr.h b/source/slang/slang-ir-constexpr.h index 04f2e59ec..92678c8f6 100644 --- a/source/slang/ir-constexpr.h +++ b/source/slang/slang-ir-constexpr.h @@ -1,4 +1,4 @@ -// ir-constexpr.h +// slang-ir-constexpr.h #pragma once namespace Slang diff --git a/source/slang/ir-dce.cpp b/source/slang/slang-ir-dce.cpp index f1a34bedf..6dc315c76 100644 --- a/source/slang/ir-dce.cpp +++ b/source/slang/slang-ir-dce.cpp @@ -1,8 +1,8 @@ -// ir-dce.cpp -#include "ir-dce.h" +// slang-ir-dce.cpp +#include "slang-ir-dce.h" -#include "ir.h" -#include "ir-insts.h" +#include "slang-ir.h" +#include "slang-ir-insts.h" namespace Slang { diff --git a/source/slang/ir-dce.h b/source/slang/slang-ir-dce.h index 6089b404a..b568d9883 100644 --- a/source/slang/ir-dce.h +++ b/source/slang/slang-ir-dce.h @@ -1,4 +1,4 @@ -// ir-dce.h +// slang-ir-dce.h #pragma once namespace Slang diff --git a/source/slang/ir-dominators.cpp b/source/slang/slang-ir-dominators.cpp index 488e67724..7960bcaf1 100644 --- a/source/slang/ir-dominators.cpp +++ b/source/slang/slang-ir-dominators.cpp @@ -1,5 +1,5 @@ -// ir-dominators.cpp -#include "ir-dominators.h" +// slang-ir-dominators.cpp +#include "slang-ir-dominators.h" // // This file implements the public interface of the `IRDominatorTree` type, @@ -15,7 +15,7 @@ // confidence that the results are correct. // -#include "ir.h" +#include "slang-ir.h" namespace Slang { diff --git a/source/slang/ir-dominators.h b/source/slang/slang-ir-dominators.h index 936e9780a..7ec31b821 100644 --- a/source/slang/ir-dominators.h +++ b/source/slang/slang-ir-dominators.h @@ -1,7 +1,7 @@ -// ir-dominators.h +// slang-ir-dominators.h #pragma once -#include "../core/basic.h" +#include "../core/slang-basic.h" namespace Slang { diff --git a/source/slang/ir-entry-point-uniforms.cpp b/source/slang/slang-ir-entry-point-uniforms.cpp index 5c7cdb5b4..20e726f25 100644 --- a/source/slang/ir-entry-point-uniforms.cpp +++ b/source/slang/slang-ir-entry-point-uniforms.cpp @@ -1,10 +1,10 @@ -// ir-entry-point-uniforms.cpp -#include "ir-entry-point-uniforms.h" +// slang-ir-entry-point-uniforms.cpp +#include "slang-ir-entry-point-uniforms.h" -#include "ir.h" -#include "ir-insts.h" +#include "slang-ir.h" +#include "slang-ir-insts.h" -#include "mangle.h" +#include "slang-mangle.h" namespace Slang { diff --git a/source/slang/ir-entry-point-uniforms.h b/source/slang/slang-ir-entry-point-uniforms.h index 5fcfab167..49994c202 100644 --- a/source/slang/ir-entry-point-uniforms.h +++ b/source/slang/slang-ir-entry-point-uniforms.h @@ -1,4 +1,4 @@ -// ir-entry-point-uniform.h +// slang-ir-entry-point-uniform.h #pragma once namespace Slang diff --git a/source/slang/ir-glsl-legalize.cpp b/source/slang/slang-ir-glsl-legalize.cpp index b63225729..1e42cba62 100644 --- a/source/slang/ir-glsl-legalize.cpp +++ b/source/slang/slang-ir-glsl-legalize.cpp @@ -1,8 +1,8 @@ -// ir-glsl-legalize.cpp -#include "ir-glsl-legalize.h" +// slang-ir-glsl-legalize.cpp +#include "slang-ir-glsl-legalize.h" -#include "ir.h" -#include "ir-insts.h" +#include "slang-ir.h" +#include "slang-ir-insts.h" #include "slang-extension-usage-tracker.h" diff --git a/source/slang/ir-glsl-legalize.h b/source/slang/slang-ir-glsl-legalize.h index 994a68247..3694005b3 100644 --- a/source/slang/ir-glsl-legalize.h +++ b/source/slang/slang-ir-glsl-legalize.h @@ -1,4 +1,4 @@ -// ir-glsl-legalize.h +// slang-ir-glsl-legalize.h #pragma once namespace Slang diff --git a/source/slang/ir-inst-defs.h b/source/slang/slang-ir-inst-defs.h index f2393b2b3..abd677979 100644 --- a/source/slang/ir-inst-defs.h +++ b/source/slang/slang-ir-inst-defs.h @@ -1,4 +1,4 @@ -// ir-inst-defs.h +// slang-ir-inst-defs.h #ifndef INST #error Must #define `INST` before including `ir-inst-defs.h` diff --git a/source/slang/ir-insts.h b/source/slang/slang-ir-insts.h index 20279e3aa..7229f04d1 100644 --- a/source/slang/ir-insts.h +++ b/source/slang/slang-ir-insts.h @@ -1,4 +1,4 @@ -// ir-insts.h +// slang-ir-insts.h #ifndef SLANG_IR_INSTS_H_INCLUDED #define SLANG_IR_INSTS_H_INCLUDED @@ -8,10 +8,10 @@ // // TODO: the builder probably needs its own file. -#include "compiler.h" -#include "ir.h" -#include "syntax.h" -#include "type-layout.h" +#include "slang-compiler.h" +#include "slang-ir.h" +#include "slang-syntax.h" +#include "slang-type-layout.h" namespace Slang { diff --git a/source/slang/ir-legalize-types.cpp b/source/slang/slang-ir-legalize-types.cpp index 18039315e..815afea72 100644 --- a/source/slang/ir-legalize-types.cpp +++ b/source/slang/slang-ir-legalize-types.cpp @@ -1,4 +1,4 @@ -// ir-legalize-types.cpp +// slang-ir-legalize-types.cpp // This file implements type legalization for the IR. // It uses the core legalization logic in @@ -10,12 +10,12 @@ // fully specialized (no more generics/interfaces), so // that the concrete type of everything is known. -#include "ir.h" -#include "ir-clone.h" -#include "ir-insts.h" -#include "legalize-types.h" -#include "mangle.h" -#include "name.h" +#include "slang-ir.h" +#include "slang-ir-clone.h" +#include "slang-ir-insts.h" +#include "slang-legalize-types.h" +#include "slang-mangle.h" +#include "slang-name.h" namespace Slang { diff --git a/source/slang/ir-link.cpp b/source/slang/slang-ir-link.cpp index dc433663a..4c1f72adb 100644 --- a/source/slang/ir-link.cpp +++ b/source/slang/slang-ir-link.cpp @@ -1,9 +1,9 @@ -// ir-link.cpp -#include "ir-link.h" +// slang-ir-link.cpp +#include "slang-ir-link.h" -#include "ir.h" -#include "ir-insts.h" -#include "mangle.h" +#include "slang-ir.h" +#include "slang-ir-insts.h" +#include "slang-mangle.h" namespace Slang { diff --git a/source/slang/ir-link.h b/source/slang/slang-ir-link.h index dba3ccc97..89486b28f 100644 --- a/source/slang/ir-link.h +++ b/source/slang/slang-ir-link.h @@ -1,7 +1,7 @@ -// ir-link.h +// slang-ir-link.h #pragma once -#include "compiler.h" +#include "slang-compiler.h" namespace Slang { diff --git a/source/slang/ir-missing-return.cpp b/source/slang/slang-ir-missing-return.cpp index c32b71ab6..527fdda5f 100644 --- a/source/slang/ir-missing-return.cpp +++ b/source/slang/slang-ir-missing-return.cpp @@ -1,8 +1,8 @@ // ir-missing-return.cpp -#include "ir-missing-return.h" +#include "slang-ir-missing-return.h" -#include "ir.h" -#include "ir-insts.h" +#include "slang-ir.h" +#include "slang-ir-insts.h" namespace Slang { diff --git a/source/slang/ir-missing-return.h b/source/slang/slang-ir-missing-return.h index 0d22a07c4..547737f62 100644 --- a/source/slang/ir-missing-return.h +++ b/source/slang/slang-ir-missing-return.h @@ -1,4 +1,4 @@ -// ir-missing-return.h +// slang-ir-missing-return.h #pragma once namespace Slang diff --git a/source/slang/ir-restructure-scoping.cpp b/source/slang/slang-ir-restructure-scoping.cpp index c5e628e71..c16db8f3c 100644 --- a/source/slang/ir-restructure-scoping.cpp +++ b/source/slang/slang-ir-restructure-scoping.cpp @@ -1,9 +1,9 @@ -// ir-restructure-scoping.cpp -#include "ir-restructure-scoping.h" +// slang-ir-restructure-scoping.cpp +#include "slang-ir-restructure-scoping.h" -#include "ir.h" -#include "ir-insts.h" -#include "ir-restructure.h" +#include "slang-ir.h" +#include "slang-ir-insts.h" +#include "slang-ir-restructure.h" namespace Slang { diff --git a/source/slang/ir-restructure-scoping.h b/source/slang/slang-ir-restructure-scoping.h index 7840dda80..6c9266754 100644 --- a/source/slang/ir-restructure-scoping.h +++ b/source/slang/slang-ir-restructure-scoping.h @@ -1,4 +1,4 @@ -// ir-restructure-scoping.h +// slang-ir-restructure-scoping.h #pragma once namespace Slang diff --git a/source/slang/ir-restructure.cpp b/source/slang/slang-ir-restructure.cpp index 47a0d1fee..e88078376 100644 --- a/source/slang/ir-restructure.cpp +++ b/source/slang/slang-ir-restructure.cpp @@ -1,8 +1,8 @@ // ir-restructure.cpp -#include "ir-restructure.h" +#include "slang-ir-restructure.h" -#include "ir.h" -#include "ir-insts.h" +#include "slang-ir.h" +#include "slang-ir-insts.h" namespace Slang { diff --git a/source/slang/ir-restructure.h b/source/slang/slang-ir-restructure.h index d27f7dbc8..6ec15f6d7 100644 --- a/source/slang/ir-restructure.h +++ b/source/slang/slang-ir-restructure.h @@ -1,7 +1,7 @@ -// ir-restructure.h +// slang-ir-restructure.h #pragma once -#include "../core/basic.h" +#include "../core/slang-basic.h" namespace Slang { diff --git a/source/slang/ir-sccp.cpp b/source/slang/slang-ir-sccp.cpp index 242ef0a37..c330d2e0a 100644 --- a/source/slang/ir-sccp.cpp +++ b/source/slang/slang-ir-sccp.cpp @@ -1,8 +1,8 @@ -// ir-sccp.cpp -#include "ir-sccp.h" +// slang-ir-sccp.cpp +#include "slang-ir-sccp.h" -#include "ir.h" -#include "ir-insts.h" +#include "slang-ir.h" +#include "slang-ir-insts.h" namespace Slang { diff --git a/source/slang/ir-sccp.h b/source/slang/slang-ir-sccp.h index cd075761a..b557eefe3 100644 --- a/source/slang/ir-sccp.h +++ b/source/slang/slang-ir-sccp.h @@ -1,4 +1,4 @@ -// ir-sccp.h +// slang-ir-sccp.h #pragma once namespace Slang diff --git a/source/slang/ir-serialize.cpp b/source/slang/slang-ir-serialize.cpp index 33238a9a6..cbb774794 100644 --- a/source/slang/ir-serialize.cpp +++ b/source/slang/slang-ir-serialize.cpp @@ -1,10 +1,10 @@ -// ir-serialize.cpp -#include "ir-serialize.h" +// slang-ir-serialize.cpp +#include "slang-ir-serialize.h" -#include "../core/text-io.h" +#include "../core/slang-text-io.h" #include "../core/slang-byte-encode-util.h" -#include "ir-insts.h" +#include "slang-ir-insts.h" #include "../core/slang-math.h" diff --git a/source/slang/ir-serialize.h b/source/slang/slang-ir-serialize.h index 8be852e95..4f4301666 100644 --- a/source/slang/ir-serialize.h +++ b/source/slang/slang-ir-serialize.h @@ -1,16 +1,16 @@ -// ir-serialize.h +// slang-ir-serialize.h #ifndef SLANG_IR_SERIALIZE_H_INCLUDED #define SLANG_IR_SERIALIZE_H_INCLUDED -#include "../core/basic.h" -#include "../core/stream.h" +#include "../core/slang-basic.h" +#include "../core/slang-stream.h" #include "../core/slang-object-scope-manager.h" -#include "ir.h" +#include "slang-ir.h" // For TranslationUnitRequest -#include "compiler.h" +#include "slang-compiler.h" namespace Slang { diff --git a/source/slang/ir-specialize-resources.cpp b/source/slang/slang-ir-specialize-resources.cpp index 96f328672..f72ca6b38 100644 --- a/source/slang/ir-specialize-resources.cpp +++ b/source/slang/slang-ir-specialize-resources.cpp @@ -1,9 +1,9 @@ -// ir-specialize-resources.cpp -#include "ir-specialize-resources.h" +// slang-ir-specialize-resources.cpp +#include "slang-ir-specialize-resources.h" -#include "ir.h" -#include "ir-clone.h" -#include "ir-insts.h" +#include "slang-ir.h" +#include "slang-ir-clone.h" +#include "slang-ir-insts.h" namespace Slang { diff --git a/source/slang/ir-specialize-resources.h b/source/slang/slang-ir-specialize-resources.h index 0e636318c..1a5e0f7d8 100644 --- a/source/slang/ir-specialize-resources.h +++ b/source/slang/slang-ir-specialize-resources.h @@ -1,4 +1,4 @@ -// ir-specialize-resources.h +// slang-ir-specialize-resources.h #pragma once namespace Slang diff --git a/source/slang/ir-specialize.cpp b/source/slang/slang-ir-specialize.cpp index b57d2b58f..fe6b82184 100644 --- a/source/slang/ir-specialize.cpp +++ b/source/slang/slang-ir-specialize.cpp @@ -1,9 +1,9 @@ -// ir-specialize.cpp -#include "ir-specialize.h" +// slang-ir-specialize.cpp +#include "slang-ir-specialize.h" -#include "ir.h" -#include "ir-clone.h" -#include "ir-insts.h" +#include "slang-ir.h" +#include "slang-ir-clone.h" +#include "slang-ir-insts.h" namespace Slang { diff --git a/source/slang/ir-specialize.h b/source/slang/slang-ir-specialize.h index 0b53d28eb..9c2c19785 100644 --- a/source/slang/ir-specialize.h +++ b/source/slang/slang-ir-specialize.h @@ -1,4 +1,4 @@ -// ir-specialize.h +// slang-ir-specialize.h #pragma once namespace Slang diff --git a/source/slang/ir-ssa.cpp b/source/slang/slang-ir-ssa.cpp index 64f9210e1..9390b1e69 100644 --- a/source/slang/ir-ssa.cpp +++ b/source/slang/slang-ir-ssa.cpp @@ -1,9 +1,9 @@ -// ir-ssa.cpp -#include "ir-ssa.h" +// slang-ir-ssa.cpp +#include "slang-ir-ssa.h" -#include "ir.h" -#include "ir-clone.h" -#include "ir-insts.h" +#include "slang-ir.h" +#include "slang-ir-clone.h" +#include "slang-ir-insts.h" namespace Slang { diff --git a/source/slang/ir-ssa.h b/source/slang/slang-ir-ssa.h index ad874845b..635810c08 100644 --- a/source/slang/ir-ssa.h +++ b/source/slang/slang-ir-ssa.h @@ -1,4 +1,4 @@ -// ir-ssa.h +// slang-ir-ssa.h #pragma once namespace Slang diff --git a/source/slang/ir-union.cpp b/source/slang/slang-ir-union.cpp index b4fbc4c96..e39fae262 100644 --- a/source/slang/ir-union.cpp +++ b/source/slang/slang-ir-union.cpp @@ -1,8 +1,8 @@ -// ir-union.cpp -#include "ir-union.h" +// slang-ir-union.cpp +#include "slang-ir-union.h" -#include "ir.h" -#include "ir-insts.h" +#include "slang-ir.h" +#include "slang-ir-insts.h" namespace Slang { diff --git a/source/slang/ir-union.h b/source/slang/slang-ir-union.h index 58de4e81e..81757dced 100644 --- a/source/slang/ir-union.h +++ b/source/slang/slang-ir-union.h @@ -1,4 +1,4 @@ -// ir-union.h +// slang-ir-union.h #pragma once namespace Slang { diff --git a/source/slang/ir-validate.cpp b/source/slang/slang-ir-validate.cpp index 9564873b1..15228200e 100644 --- a/source/slang/ir-validate.cpp +++ b/source/slang/slang-ir-validate.cpp @@ -1,8 +1,8 @@ -// ir-validate.cpp -#include "ir-validate.h" +// slang-ir-validate.cpp +#include "slang-ir-validate.h" -#include "ir.h" -#include "ir-insts.h" +#include "slang-ir.h" +#include "slang-ir-insts.h" namespace Slang { diff --git a/source/slang/ir-validate.h b/source/slang/slang-ir-validate.h index 1cb30961d..c9b0016f4 100644 --- a/source/slang/ir-validate.h +++ b/source/slang/slang-ir-validate.h @@ -1,4 +1,4 @@ -// ir-validate.h +// slang-ir-validate.h #pragma once namespace Slang diff --git a/source/slang/ir.cpp b/source/slang/slang-ir.cpp index 1045b4884..4975ac824 100644 --- a/source/slang/ir.cpp +++ b/source/slang/slang-ir.cpp @@ -1,10 +1,10 @@ -// ir.cpp -#include "ir.h" -#include "ir-insts.h" +// slang-ir.cpp +#include "slang-ir.h" +#include "slang-ir-insts.h" -#include "../core/basic.h" +#include "../core/slang-basic.h" -#include "mangle.h" +#include "slang-mangle.h" namespace Slang { @@ -34,7 +34,7 @@ namespace Slang // Main ops in order #define INST(ID, MNEMONIC, ARG_COUNT, FLAGS) \ { kIROp_##ID, { #MNEMONIC, ARG_COUNT, FLAGS, } }, -#include "ir-inst-defs.h" +#include "slang-ir-inst-defs.h" // Pseudo ops #define INST(ID, MNEMONIC, ARG_COUNT, FLAGS) /* empty */ @@ -44,7 +44,7 @@ namespace Slang // First is 'invalid' { kIROp_Invalid,{ "invalid", 0, 0 } }, // Then all the other psuedo ops -#include "ir-inst-defs.h" +#include "slang-ir-inst-defs.h" }; diff --git a/source/slang/ir.h b/source/slang/slang-ir.h index e7f9dff75..956d97ad3 100644 --- a/source/slang/ir.h +++ b/source/slang/slang-ir.h @@ -1,4 +1,4 @@ -// ir.h +// slang-ir.h #ifndef SLANG_IR_H_INCLUDED #define SLANG_IR_H_INCLUDED @@ -7,14 +7,14 @@ // similar in spirit to LLVM (but much simpler). // -#include "../core/basic.h" +#include "../core/slang-basic.h" -#include "source-loc.h" +#include "slang-source-loc.h" #include "../core/slang-memory-arena.h" #include "../core/slang-object-scope-manager.h" -#include "type-system-shared.h" +#include "slang-type-system-shared.h" namespace Slang { @@ -55,7 +55,7 @@ enum IROp : int32_t #define INST(ID, MNEMONIC, ARG_COUNT, FLAGS) \ kIROp_##ID, -#include "ir-inst-defs.h" +#include "slang-ir-inst-defs.h" kIROpCount, @@ -70,14 +70,14 @@ enum IROp : int32_t kIRPseudoOp_LastPlusOne, -#include "ir-inst-defs.h" +#include "slang-ir-inst-defs.h" #define INST(ID, MNEMONIC, ARG_COUNT, FLAGS) /* empty */ #define INST_RANGE(BASE, FIRST, LAST) \ kIROp_First##BASE = kIROp_##FIRST, \ kIROp_Last##BASE = kIROp_##LAST, -#include "ir-inst-defs.h" +#include "slang-ir-inst-defs.h" }; /* IROpMeta describe values for layout of IROp, as well as values for accessing aspects of IROp bits. */ diff --git a/source/slang/legalize-types.cpp b/source/slang/slang-legalize-types.cpp index 64dafb938..d541818ba 100644 --- a/source/slang/legalize-types.cpp +++ b/source/slang/slang-legalize-types.cpp @@ -1,8 +1,8 @@ -// legalize-types.cpp -#include "legalize-types.h" +// slang-legalize-types.cpp +#include "slang-legalize-types.h" -#include "ir-insts.h" -#include "mangle.h" +#include "slang-ir-insts.h" +#include "slang-mangle.h" namespace Slang { diff --git a/source/slang/legalize-types.h b/source/slang/slang-legalize-types.h index b35ed9d3c..e92a9fc41 100644 --- a/source/slang/legalize-types.h +++ b/source/slang/slang-legalize-types.h @@ -1,4 +1,4 @@ -// legalize-types.h +// slang-legalize-types.h #ifndef SLANG_LEGALIZE_TYPES_H_INCLUDED #define SLANG_LEGALIZE_TYPES_H_INCLUDED @@ -23,11 +23,11 @@ // of an aggregate (containing the legal/legalized fields), // and some extra tuple-ified fields. -#include "../core/basic.h" -#include "ir-insts.h" -#include "syntax.h" -#include "type-layout.h" -#include "name.h" +#include "../core/slang-basic.h" +#include "slang-ir-insts.h" +#include "slang-syntax.h" +#include "slang-type-layout.h" +#include "slang-name.h" namespace Slang { diff --git a/source/slang/lexer.cpp b/source/slang/slang-lexer.cpp index 8cb9fa5ee..d7c086fba 100644 --- a/source/slang/lexer.cpp +++ b/source/slang/slang-lexer.cpp @@ -1,12 +1,12 @@ -// lexer.cpp -#include "lexer.h" +// slang-lexer.cpp +#include "slang-lexer.h" // This file implements the lexer/scanner, which is responsible for taking a raw stream of // input bytes and turning it into semantically useful tokens. // -#include "compiler.h" -#include "source-loc.h" +#include "slang-compiler.h" +#include "slang-source-loc.h" #include <assert.h> diff --git a/source/slang/lexer.h b/source/slang/slang-lexer.h index 8587cc904..d3bf68e45 100644 --- a/source/slang/lexer.h +++ b/source/slang/slang-lexer.h @@ -1,8 +1,8 @@ -#ifndef RASTER_RENDERER_LEXER_H -#define RASTER_RENDERER_LEXER_H +#ifndef SLANG_LEXER_H +#define SLANG_LEXER_H -#include "../core/basic.h" -#include "diagnostics.h" +#include "../core/slang-basic.h" +#include "slang-diagnostics.h" namespace Slang { diff --git a/source/slang/lookup.cpp b/source/slang/slang-lookup.cpp index fe535d6e7..0a77a259a 100644 --- a/source/slang/lookup.cpp +++ b/source/slang/slang-lookup.cpp @@ -1,6 +1,6 @@ -// lookup.cpp -#include "lookup.h" -#include "name.h" +// slang-lookup.cpp +#include "slang-lookup.h" +#include "slang-name.h" namespace Slang { diff --git a/source/slang/lookup.h b/source/slang/slang-lookup.h index 37ab5cf06..705b952f3 100644 --- a/source/slang/lookup.h +++ b/source/slang/slang-lookup.h @@ -1,7 +1,7 @@ #ifndef SLANG_LOOKUP_H_INCLUDED #define SLANG_LOOKUP_H_INCLUDED -#include "syntax.h" +#include "slang-syntax.h" namespace Slang { @@ -57,4 +57,4 @@ QualType getTypeForDeclRef( } -#endif
\ No newline at end of file +#endif diff --git a/source/slang/lower-to-ir.cpp b/source/slang/slang-lower-to-ir.cpp index a7be244c8..8425b9664 100644 --- a/source/slang/lower-to-ir.cpp +++ b/source/slang/slang-lower-to-ir.cpp @@ -1,19 +1,19 @@ // lower.cpp -#include "lower-to-ir.h" +#include "slang-lower-to-ir.h" #include "../../slang.h" -#include "check.h" -#include "ir.h" -#include "ir-constexpr.h" -#include "ir-insts.h" -#include "ir-missing-return.h" -#include "ir-sccp.h" -#include "ir-ssa.h" -#include "ir-validate.h" -#include "mangle.h" -#include "type-layout.h" -#include "visitor.h" +#include "slang-check.h" +#include "slang-ir.h" +#include "slang-ir-constexpr.h" +#include "slang-ir-insts.h" +#include "slang-ir-missing-return.h" +#include "slang-ir-sccp.h" +#include "slang-ir-ssa.h" +#include "slang-ir-validate.h" +#include "slang-mangle.h" +#include "slang-type-layout.h" +#include "slang-visitor.h" namespace Slang { diff --git a/source/slang/lower-to-ir.h b/source/slang/slang-lower-to-ir.h index 6ac2e182a..060efb88b 100644 --- a/source/slang/lower-to-ir.h +++ b/source/slang/slang-lower-to-ir.h @@ -1,4 +1,4 @@ -// lower.h +// slang-lower-to-ir.h #ifndef SLANG_LOWER_TO_IR_H_INCLUDED #define SLANG_LOWER_TO_IR_H_INCLUDED @@ -6,10 +6,10 @@ // our intermediate representation, to facilitate further // optimization and transformation. -#include "../core/basic.h" +#include "../core/slang-basic.h" -#include "compiler.h" -#include "ir.h" +#include "slang-compiler.h" +#include "slang-ir.h" namespace Slang { diff --git a/source/slang/mangle.cpp b/source/slang/slang-mangle.cpp index 2ed9cfea6..16f7b64bb 100644 --- a/source/slang/mangle.cpp +++ b/source/slang/slang-mangle.cpp @@ -1,7 +1,7 @@ -#include "mangle.h" +#include "slang-mangle.h" -#include "name.h" -#include "syntax.h" +#include "slang-name.h" +#include "slang-syntax.h" namespace Slang { diff --git a/source/slang/mangle.h b/source/slang/slang-mangle.h index 7fc8d0d93..5e03f8228 100644 --- a/source/slang/mangle.h +++ b/source/slang/slang-mangle.h @@ -3,8 +3,8 @@ // This file implements the name mangling scheme for the Slang language. -#include "../core/basic.h" -#include "syntax.h" +#include "../core/slang-basic.h" +#include "slang-syntax.h" namespace Slang { @@ -26,4 +26,4 @@ namespace Slang String getMangledTypeName(Type* type); } -#endif
\ No newline at end of file +#endif diff --git a/source/slang/slang-mangled-lexer.h b/source/slang/slang-mangled-lexer.h index 4890ae80f..8ec86c982 100644 --- a/source/slang/slang-mangled-lexer.h +++ b/source/slang/slang-mangled-lexer.h @@ -2,9 +2,9 @@ #ifndef SLANG_MANGLED_LEXER_H_INCLUDED #define SLANG_MANGLED_LEXER_H_INCLUDED -#include "../core/basic.h" +#include "../core/slang-basic.h" -#include "compiler.h" +#include "slang-compiler.h" namespace Slang { diff --git a/source/slang/modifier-defs.h b/source/slang/slang-modifier-defs.h index 01ed792a9..2af1f0f8f 100644 --- a/source/slang/modifier-defs.h +++ b/source/slang/slang-modifier-defs.h @@ -1,4 +1,4 @@ -// modifier-defs.h +// slang-modifier-defs.h // Syntax class definitions for modifiers. diff --git a/source/slang/name.cpp b/source/slang/slang-name.cpp index 21586e0b6..8934b17bd 100644 --- a/source/slang/name.cpp +++ b/source/slang/slang-name.cpp @@ -1,5 +1,5 @@ -// name.cpp -#include "name.h" +// slang-name.cpp +#include "slang-name.h" namespace Slang { diff --git a/source/slang/name.h b/source/slang/slang-name.h index a144fbb84..de04d5fdf 100644 --- a/source/slang/name.h +++ b/source/slang/slang-name.h @@ -1,11 +1,11 @@ -// name.h +// slang-name.h #ifndef SLANG_NAME_H_INCLUDED #define SLANG_NAME_H_INCLUDED // This file defines the `Name` type, used to represent // the name of types, variables, etc. in the AST. -#include "../core/basic.h" +#include "../core/slang-basic.h" namespace Slang { diff --git a/source/slang/object-meta-begin.h b/source/slang/slang-object-meta-begin.h index 7340ed413..9c09e845d 100644 --- a/source/slang/object-meta-begin.h +++ b/source/slang/slang-object-meta-begin.h @@ -1,4 +1,4 @@ -// object-meta-begin.h +// slang-object-meta-begin.h #ifndef SYNTAX_CLASS #error The 'SYNTAX_CLASS' macro should be defined before including 'object-meta-begin.h' diff --git a/source/slang/object-meta-end.h b/source/slang/slang-object-meta-end.h index 96f41d39d..5018b5ede 100644 --- a/source/slang/object-meta-end.h +++ b/source/slang/slang-object-meta-end.h @@ -1,4 +1,4 @@ -// object-meta-end.h +// slang-object-meta-end.h #undef SYNTAX_CLASS #undef ABSTRACT_SYNTAX_CLASS diff --git a/source/slang/options.cpp b/source/slang/slang-options.cpp index 46e0203cf..85a2662bc 100644 --- a/source/slang/options.cpp +++ b/source/slang/slang-options.cpp @@ -1,12 +1,12 @@ -// options.cpp +// slang-options.cpp // Implementation of options parsing for `slangc` command line, // and also for API interface that takes command-line argument strings. #include "../../slang.h" -#include "compiler.h" -#include "profile.h" +#include "slang-compiler.h" +#include "slang-profile.h" #include <assert.h> diff --git a/source/slang/parameter-binding.cpp b/source/slang/slang-parameter-binding.cpp index bdb76a005..5c4fd24b5 100644 --- a/source/slang/parameter-binding.cpp +++ b/source/slang/slang-parameter-binding.cpp @@ -1,9 +1,9 @@ -// parameter-binding.cpp -#include "parameter-binding.h" +// slang-parameter-binding.cpp +#include "slang-parameter-binding.h" -#include "lookup.h" -#include "compiler.h" -#include "type-layout.h" +#include "slang-lookup.h" +#include "slang-compiler.h" +#include "slang-type-layout.h" #include "../../slang.h" diff --git a/source/slang/parameter-binding.h b/source/slang/slang-parameter-binding.h index 82b114021..139064680 100644 --- a/source/slang/parameter-binding.h +++ b/source/slang/slang-parameter-binding.h @@ -1,8 +1,8 @@ #ifndef SLANG_PARAMETER_BINDING_H #define SLANG_PARAMETER_BINDING_H -#include "../core/basic.h" -#include "syntax.h" +#include "../core/slang-basic.h" +#include "slang-syntax.h" #include "../../slang.h" @@ -31,4 +31,4 @@ void generateParameterBindings( } -#endif // SLANG_REFLECTION_H +#endif diff --git a/source/slang/parser.cpp b/source/slang/slang-parser.cpp index 825aea324..bb70347c9 100644 --- a/source/slang/parser.cpp +++ b/source/slang/slang-parser.cpp @@ -1,10 +1,10 @@ -#include "parser.h" +#include "slang-parser.h" #include <assert.h> -#include "compiler.h" -#include "lookup.h" -#include "visitor.h" +#include "slang-compiler.h" +#include "slang-lookup.h" +#include "slang-visitor.h" namespace Slang { diff --git a/source/slang/parser.h b/source/slang/slang-parser.h index abad902da..98fd9ed65 100644 --- a/source/slang/parser.h +++ b/source/slang/slang-parser.h @@ -1,9 +1,9 @@ -#ifndef RASTER_RENDERER_PARSER_H -#define RASTER_RENDERER_PARSER_H +#ifndef SLANG_PARSER_H +#define SLANG_PARSER_H -#include "lexer.h" -#include "compiler.h" -#include "syntax.h" +#include "slang-lexer.h" +#include "slang-compiler.h" +#include "slang-syntax.h" namespace Slang { @@ -27,4 +27,4 @@ namespace Slang RefPtr<Scope> scope); } -#endif
\ No newline at end of file +#endif diff --git a/source/slang/preprocessor.cpp b/source/slang/slang-preprocessor.cpp index bf6f7b7ca..16a64e571 100644 --- a/source/slang/preprocessor.cpp +++ b/source/slang/slang-preprocessor.cpp @@ -1,11 +1,11 @@ -// preprocessor.cpp -#include "preprocessor.h" +// slang-preprocessor.cpp +#include "slang-preprocessor.h" -#include "compiler.h" -#include "diagnostics.h" -#include "lexer.h" +#include "slang-compiler.h" +#include "slang-diagnostics.h" +#include "slang-lexer.h" // Needed so that we can construct modifier syntax to represent GLSL directives -#include "syntax.h" +#include "slang-syntax.h" #include <assert.h> diff --git a/source/slang/preprocessor.h b/source/slang/slang-preprocessor.h index 6e8ac1c69..191adce88 100644 --- a/source/slang/preprocessor.h +++ b/source/slang/slang-preprocessor.h @@ -2,8 +2,8 @@ #ifndef SLANG_PREPROCESSOR_H_INCLUDED #define SLANG_PREPROCESSOR_H_INCLUDED -#include "../core/basic.h" -#include "../slang/lexer.h" +#include "../core/slang-basic.h" +#include "../slang/slang-lexer.h" namespace Slang { diff --git a/source/slang/profile-defs.h b/source/slang/slang-profile-defs.h index 238621084..238621084 100644 --- a/source/slang/profile-defs.h +++ b/source/slang/slang-profile-defs.h diff --git a/source/slang/profile.cpp b/source/slang/slang-profile.cpp index 5f506741f..204b467f9 100644 --- a/source/slang/profile.cpp +++ b/source/slang/slang-profile.cpp @@ -1,5 +1,5 @@ -// profile.cpp -#include "profile.h" +// slang-profile.cpp +#include "slang-profile.h" namespace Slang { @@ -10,7 +10,7 @@ ProfileFamily getProfileFamily(ProfileVersion version) default: return ProfileFamily::Unknown; #define PROFILE_VERSION(TAG, FAMILY) case ProfileVersion::TAG: return ProfileFamily::FAMILY; -#include "profile-defs.h" +#include "slang-profile-defs.h" } } @@ -21,7 +21,7 @@ const char* getStageName(Stage stage) #define PROFILE_STAGE(ID, NAME, ENUM) \ case Stage::ID: return #NAME; -#include "profile-defs.h" +#include "slang-profile-defs.h" default: return nullptr; diff --git a/source/slang/profile.h b/source/slang/slang-profile.h index cc142bc2a..de471282d 100644 --- a/source/slang/profile.h +++ b/source/slang/slang-profile.h @@ -1,7 +1,7 @@ #ifndef SLANG_PROFILE_H_INCLUDED #define SLANG_PROFILE_H_INCLUDED -#include "../core/basic.h" +#include "../core/slang-basic.h" #include "../../slang.h" namespace Slang @@ -20,21 +20,21 @@ namespace Slang { Unknown, #define LANGUAGE(TAG, NAME) TAG, -#include "profile-defs.h" +#include "slang-profile-defs.h" }; enum class ProfileFamily { Unknown, #define PROFILE_FAMILY(TAG) TAG, -#include "profile-defs.h" +#include "slang-profile-defs.h" }; enum class ProfileVersion { Unknown, #define PROFILE_VERSION(TAG, FAMILY) TAG, -#include "profile-defs.h" +#include "slang-profile-defs.h" }; enum class Stage : SlangStage @@ -42,7 +42,7 @@ namespace Slang Unknown = SLANG_STAGE_NONE, #define PROFILE_STAGE(TAG, NAME, VAL) TAG = VAL, #define PROFILE_STAGE_ALIAS(TAG, NAME, VAL) TAG = VAL, -#include "profile-defs.h" +#include "slang-profile-defs.h" }; const char* getStageName(Stage stage); @@ -58,7 +58,7 @@ namespace Slang #define PROFILE(TAG, NAME, STAGE, VERSION) TAG = (uint32_t(ProfileVersion::VERSION) << 16) | uint32_t(Stage::STAGE), #define PROFILE_ALIAS(TAG, DEF, NAME) TAG = DEF, -#include "profile-defs.h" +#include "slang-profile-defs.h" }; Profile() {} diff --git a/source/slang/reflection.cpp b/source/slang/slang-reflection.cpp index 4d13052f6..c5428cdeb 100644 --- a/source/slang/reflection.cpp +++ b/source/slang/slang-reflection.cpp @@ -1,9 +1,9 @@ -// reflection.cpp -#include "reflection.h" +// slang-reflection.cpp +#include "slang-reflection.h" -#include "compiler.h" -#include "type-layout.h" -#include "syntax.h" +#include "slang-compiler.h" +#include "slang-type-layout.h" +#include "slang-syntax.h" #include <assert.h> // Don't signal errors for stuff we don't implement here, diff --git a/source/slang/reflection.h b/source/slang/slang-reflection.h index 09f02d8dd..ea3021bd6 100644 --- a/source/slang/reflection.h +++ b/source/slang/slang-reflection.h @@ -1,8 +1,8 @@ #ifndef SLANG_REFLECTION_H #define SLANG_REFLECTION_H -#include "../core/basic.h" -#include "syntax.h" +#include "../core/slang-basic.h" +#include "slang-syntax.h" #include "../../slang.h" diff --git a/source/slang/source-loc.cpp b/source/slang/slang-source-loc.cpp index c66fdedb5..faa7e77c3 100644 --- a/source/slang/source-loc.cpp +++ b/source/slang/slang-source-loc.cpp @@ -1,7 +1,7 @@ -// source-loc.cpp -#include "source-loc.h" +// slang-source-loc.cpp +#include "slang-source-loc.h" -#include "compiler.h" +#include "slang-compiler.h" #include "../core/slang-string-util.h" diff --git a/source/slang/source-loc.h b/source/slang/slang-source-loc.h index 95db7a50e..632c05084 100644 --- a/source/slang/source-loc.h +++ b/source/slang/slang-source-loc.h @@ -1,8 +1,8 @@ -// source-loc.h +// slang-source-loc.h #ifndef SLANG_SOURCE_LOC_H_INCLUDED #define SLANG_SOURCE_LOC_H_INCLUDED -#include "../core/basic.h" +#include "../core/slang-basic.h" #include "../core/slang-memory-arena.h" #include "../core/slang-string-slice-pool.h" diff --git a/source/slang/slang-source-stream.h b/source/slang/slang-source-stream.h index 8dcd29c8d..e6b7507c0 100644 --- a/source/slang/slang-source-stream.h +++ b/source/slang/slang-source-stream.h @@ -2,9 +2,9 @@ #ifndef SLANG_SOURCE_STREAM_H_INCLUDED #define SLANG_SOURCE_STREAM_H_INCLUDED -#include "../core/basic.h" +#include "../core/slang-basic.h" -#include "compiler.h" +#include "slang-compiler.h" namespace Slang { diff --git a/source/slang/slang-stdlib.cpp b/source/slang/slang-stdlib.cpp index d2d29beae..036a40ac2 100644 --- a/source/slang/slang-stdlib.cpp +++ b/source/slang/slang-stdlib.cpp @@ -1,8 +1,8 @@ // slang-stdlib.cpp -#include "compiler.h" -#include "ir.h" -#include "syntax.h" +#include "slang-compiler.h" +#include "slang-ir.h" +#include "slang-syntax.h" #define STRINGIZE(x) STRINGIZE2(x) #define STRINGIZE2(x) #x diff --git a/source/slang/stmt-defs.h b/source/slang/slang-stmt-defs.h index 01dbcc4ca..bf25f1706 100644 --- a/source/slang/stmt-defs.h +++ b/source/slang/slang-stmt-defs.h @@ -1,4 +1,4 @@ -// stmt-defs.h +// slang-stmt-defs.h // Syntax class definitions for statements. diff --git a/source/slang/syntax-base-defs.h b/source/slang/slang-syntax-base-defs.h index b0da3f57e..2f7c8b1fa 100644 --- a/source/slang/syntax-base-defs.h +++ b/source/slang/slang-syntax-base-defs.h @@ -1,4 +1,4 @@ -// syntax-base-defs.h +// slang-syntax-base-defs.h // This file defines the primary base classes for the hierarchy of // AST nodes and related objects. For example, this is where the diff --git a/source/slang/slang-syntax-defs.h b/source/slang/slang-syntax-defs.h new file mode 100644 index 000000000..5a16c3709 --- /dev/null +++ b/source/slang/slang-syntax-defs.h @@ -0,0 +1,10 @@ +// slang-syntax-defs.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" diff --git a/source/slang/syntax-visitors.h b/source/slang/slang-syntax-visitors.h index 3fca323e8..dc230f051 100644 --- a/source/slang/syntax-visitors.h +++ b/source/slang/slang-syntax-visitors.h @@ -1,8 +1,8 @@ -#ifndef RASTER_RENDERER_SYNTAX_PRINTER_H -#define RASTER_RENDERER_SYNTAX_PRINTER_H +#ifndef SLANG_SYNTAX_VISITORS_H +#define SLANG_SYNTAX_VISITORS_H -#include "diagnostics.h" -#include "syntax.h" +#include "slang-diagnostics.h" +#include "slang-syntax.h" namespace Slang { @@ -33,4 +33,4 @@ namespace Slang DiagnosticSink* sink); } -#endif
\ No newline at end of file +#endif diff --git a/source/slang/syntax.cpp b/source/slang/slang-syntax.cpp index 17c85175d..08d671241 100644 --- a/source/slang/syntax.cpp +++ b/source/slang/slang-syntax.cpp @@ -1,7 +1,7 @@ -#include "syntax.h" +#include "slang-syntax.h" -#include "compiler.h" -#include "visitor.h" +#include "slang-compiler.h" +#include "slang-visitor.h" #include <typeinfo> #include <assert.h> @@ -24,9 +24,9 @@ namespace Slang // Generate dispatch logic and other definitions for all syntax classes #define SYNTAX_CLASS(NAME, BASE) /* empty */ -#include "object-meta-begin.h" +#include "slang-object-meta-begin.h" -#include "syntax-base-defs.h" +#include "slang-syntax-base-defs.h" #undef SYNTAX_CLASS #undef ABSTRACT_SYNTAX_CLASS @@ -63,13 +63,13 @@ ABSTRACT_SYNTAX_CLASS(GenericSubstitution, Substitutions); ABSTRACT_SYNTAX_CLASS(ThisTypeSubstitution, Substitutions); ABSTRACT_SYNTAX_CLASS(GlobalGenericParamSubstitution, Substitutions); -#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-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" bool SyntaxClassBase::isSubClassOfImpl(SyntaxClassBase const& super) const { @@ -2732,7 +2732,7 @@ bool findImageFormatByName(char const* name, ImageFormat* outFormat) } kFormats[] = { #define FORMAT(NAME) { #NAME, ImageFormat::NAME }, -#include "image-format-defs.h" +#include "slang-image-format-defs.h" }; for( auto item : kFormats ) @@ -2753,7 +2753,7 @@ char const* getGLSLNameForImageFormat(ImageFormat format) { default: return "unhandled"; #define FORMAT(NAME) case ImageFormat::NAME: return #NAME; -#include "image-format-defs.h" +#include "slang-image-format-defs.h" } } diff --git a/source/slang/syntax.h b/source/slang/slang-syntax.h index aa3944d0a..049220ef9 100644 --- a/source/slang/syntax.h +++ b/source/slang/slang-syntax.h @@ -1,11 +1,11 @@ #ifndef SLANG_SYNTAX_H #define SLANG_SYNTAX_H -#include "../core/basic.h" -#include "ir.h" -#include "lexer.h" -#include "profile.h" -#include "type-system-shared.h" +#include "../core/slang-basic.h" +#include "slang-ir.h" +#include "slang-lexer.h" +#include "slang-profile.h" +#include "slang-type-system-shared.h" #include "../../slang.h" #include <assert.h> @@ -86,7 +86,7 @@ namespace Slang enum class ImageFormat { #define FORMAT(NAME) NAME, -#include "image-format-defs.h" +#include "slang-image-format-defs.h" }; bool findImageFormatByName(char const* name, ImageFormat* outFormat); @@ -106,9 +106,9 @@ namespace Slang // Forward-declare all syntax classes #define SYNTAX_CLASS(NAME, BASE, ...) class NAME; -#include "object-meta-begin.h" -#include "syntax-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-syntax-defs.h" +#include "slang-object-meta-end.h" // Helper type for pairing up a name and the location where it appeared struct NameLoc @@ -1137,9 +1137,9 @@ namespace Slang #define RAW(...) __VA_ARGS__ #define END_SYNTAX_CLASS() }; #define SYNTAX_CLASS(NAME, BASE, ...) class NAME : public BASE {public: -#include "object-meta-begin.h" +#include "slang-object-meta-begin.h" -#include "syntax-base-defs.h" +#include "slang-syntax-base-defs.h" #undef SYNTAX_CLASS #undef ABSTRACT_SYNTAX_CLASS @@ -1151,14 +1151,14 @@ namespace Slang virtual void accept(NAME::Visitor* visitor, void* extra) override; \ public: virtual SyntaxClass<NodeBase> getClass() override; \ public: /* ... */ -#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-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" inline RefPtr<Type> GetSub(DeclRef<GenericTypeConstraintDecl> const& declRef) { diff --git a/source/slang/token-defs.h b/source/slang/slang-token-defs.h index 873a252b4..6cece330e 100644 --- a/source/slang/token-defs.h +++ b/source/slang/slang-token-defs.h @@ -1,4 +1,4 @@ -// token-defs.h +// slang-token-defs.h // This file is meant to be included multiple times, to produce different // pieces of code related to tokens diff --git a/source/slang/token.cpp b/source/slang/slang-token.cpp index 42f7ab55f..a8238eb6c 100644 --- a/source/slang/token.cpp +++ b/source/slang/slang-token.cpp @@ -1,5 +1,5 @@ -// token.cpp -#include "token.h" +// slang-token.cpp +#include "slang-token.h" #include <assert.h> @@ -32,7 +32,7 @@ char const* TokenTypeToString(TokenType type) return "<uknown>"; #define TOKEN(NAME, DESC) case TokenType::NAME: return DESC; -#include "token-defs.h" +#include "slang-token-defs.h" } } diff --git a/source/slang/token.h b/source/slang/slang-token.h index d7d45882d..193b128fa 100644 --- a/source/slang/token.h +++ b/source/slang/slang-token.h @@ -1,10 +1,10 @@ -// token.h +// slang-token.h #ifndef SLANG_TOKEN_H_INCLUDED #define SLANG_TOKEN_H_INCLUDED -#include "../core/basic.h" +#include "../core/slang-basic.h" -#include "source-loc.h" +#include "slang-source-loc.h" namespace Slang { @@ -13,7 +13,7 @@ class Name; enum class TokenType { #define TOKEN(NAME, DESC) NAME, -#include "token-defs.h" +#include "slang-token-defs.h" }; char const* TokenTypeToString(TokenType type); diff --git a/source/slang/type-defs.h b/source/slang/slang-type-defs.h index d0c00c73a..d9907bafe 100644 --- a/source/slang/type-defs.h +++ b/source/slang/slang-type-defs.h @@ -1,4 +1,4 @@ -// type-defs.h +// slang-type-defs.h // Syntax class definitions for types. @@ -487,4 +487,4 @@ RAW( virtual RefPtr<Type> CreateCanonicalType() override; virtual RefPtr<Val> SubstituteImpl(SubstitutionSet subst, int* ioDiff) override; ) -END_SYNTAX_CLASS()
\ No newline at end of file +END_SYNTAX_CLASS() diff --git a/source/slang/type-layout.cpp b/source/slang/slang-type-layout.cpp index 92f7d6af3..30ab53ca6 100644 --- a/source/slang/type-layout.cpp +++ b/source/slang/slang-type-layout.cpp @@ -1,7 +1,7 @@ -// TypeLayout.cpp -#include "type-layout.h" +// slang-type-layout.cpp +#include "slang-type-layout.h" -#include "syntax.h" +#include "slang-syntax.h" #include <assert.h> diff --git a/source/slang/type-layout.h b/source/slang/slang-type-layout.h index c58f92cfb..97113c77f 100644 --- a/source/slang/type-layout.h +++ b/source/slang/slang-type-layout.h @@ -1,10 +1,10 @@ #ifndef SLANG_TYPE_LAYOUT_H #define SLANG_TYPE_LAYOUT_H -#include "../core/basic.h" -#include "compiler.h" -#include "profile.h" -#include "syntax.h" +#include "../core/slang-basic.h" +#include "slang-compiler.h" +#include "slang-profile.h" +#include "slang-syntax.h" #include "../../slang.h" diff --git a/source/slang/type-system-shared.cpp b/source/slang/slang-type-system-shared.cpp index 10ebaee24..7ccde5bcd 100644 --- a/source/slang/type-system-shared.cpp +++ b/source/slang/slang-type-system-shared.cpp @@ -1,4 +1,4 @@ -#include "type-system-shared.h" +#include "slang-type-system-shared.h" namespace Slang { diff --git a/source/slang/type-system-shared.h b/source/slang/slang-type-system-shared.h index 95840e701..95840e701 100644 --- a/source/slang/type-system-shared.h +++ b/source/slang/slang-type-system-shared.h diff --git a/source/slang/val-defs.h b/source/slang/slang-val-defs.h index f5b099079..b9d5188ed 100644 --- a/source/slang/val-defs.h +++ b/source/slang/slang-val-defs.h @@ -1,4 +1,4 @@ -// val-defs.h +// slang-val-defs.h // Syntax class definitions for compile-time values. diff --git a/source/slang/visitor.h b/source/slang/slang-visitor.h index 8a0301782..c6d63cd40 100644 --- a/source/slang/visitor.h +++ b/source/slang/slang-visitor.h @@ -1,11 +1,11 @@ -// visitor.h +// slang-visitor.h #ifndef SLANG_VISITOR_H_INCLUDED #define SLANG_VISITOR_H_INCLUDED // This file defines the basic "Visitor" pattern for doing dispatch // over the various categories of syntax node. -#include "syntax.h" +#include "slang-syntax.h" namespace Slang { @@ -19,9 +19,9 @@ struct ITypeVisitor #define SYNTAX_CLASS(NAME, BASE) \ virtual void dispatch_##NAME(NAME* obj, void* extra) = 0; -#include "object-meta-begin.h" -#include "type-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-type-defs.h" +#include "slang-object-meta-end.h" }; template<typename Derived, typename Result = void, typename Base = ITypeVisitor> @@ -46,18 +46,18 @@ struct TypeVisitor : Base virtual void dispatch_##NAME(NAME* obj, void* extra) override \ { *(Result*)extra = ((Derived*) this)->visit##NAME(obj); } -#include "object-meta-begin.h" -#include "type-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-type-defs.h" +#include "slang-object-meta-end.h" #define ABSTRACT_SYNTAX_CLASS(NAME,BASE) SYNTAX_CLASS(NAME, BASE) #define SYNTAX_CLASS(NAME, BASE) \ Result visit##NAME(NAME* obj) \ { return ((Derived*) this)->visit##BASE(obj); } -#include "object-meta-begin.h" -#include "type-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-type-defs.h" +#include "slang-object-meta-end.h" }; template<typename Derived, typename Base> @@ -78,18 +78,18 @@ struct TypeVisitor<Derived,void,Base> : Base virtual void dispatch_##NAME(NAME* obj, void*) override \ { ((Derived*) this)->visit##NAME(obj); } -#include "object-meta-begin.h" -#include "type-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-type-defs.h" +#include "slang-object-meta-end.h" #define ABSTRACT_SYNTAX_CLASS(NAME,BASE) SYNTAX_CLASS(NAME, BASE) #define SYNTAX_CLASS(NAME, BASE) \ void visit##NAME(NAME* obj) \ { ((Derived*) this)->visit##BASE(obj); } -#include "object-meta-begin.h" -#include "type-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-type-defs.h" +#include "slang-object-meta-end.h" }; template<typename Derived, typename Arg, typename Base = ITypeVisitor> @@ -105,18 +105,18 @@ struct TypeVisitorWithArg : Base virtual void dispatch_##NAME(NAME* obj, void* arg) override \ { ((Derived*) this)->visit##NAME(obj, *(Arg*)arg); } -#include "object-meta-begin.h" -#include "type-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-type-defs.h" +#include "slang-object-meta-end.h" #define ABSTRACT_SYNTAX_CLASS(NAME,BASE) SYNTAX_CLASS(NAME, BASE) #define SYNTAX_CLASS(NAME, BASE) \ void visit##NAME(NAME* obj, Arg const& arg) \ { ((Derived*) this)->visit##BASE(obj, arg); } -#include "object-meta-begin.h" -#include "type-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-type-defs.h" +#include "slang-object-meta-end.h" }; // @@ -129,9 +129,9 @@ struct IExprVisitor #define SYNTAX_CLASS(NAME, BASE) \ virtual void dispatch_##NAME(NAME* obj, void* extra) = 0; -#include "object-meta-begin.h" -#include "expr-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-expr-defs.h" +#include "slang-object-meta-end.h" }; template<typename Derived, typename Result = void> @@ -149,18 +149,18 @@ struct ExprVisitor : IExprVisitor virtual void dispatch_##NAME(NAME* obj, void* extra) override \ { *(Result*)extra = ((Derived*) this)->visit##NAME(obj); } -#include "object-meta-begin.h" -#include "expr-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-expr-defs.h" +#include "slang-object-meta-end.h" #define ABSTRACT_SYNTAX_CLASS(NAME,BASE) SYNTAX_CLASS(NAME, BASE) #define SYNTAX_CLASS(NAME, BASE) \ Result visit##NAME(NAME* obj) \ { return ((Derived*) this)->visit##BASE(obj); } -#include "object-meta-begin.h" -#include "expr-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-expr-defs.h" +#include "slang-object-meta-end.h" }; template<typename Derived> @@ -176,18 +176,18 @@ struct ExprVisitor<Derived,void> : IExprVisitor virtual void dispatch_##NAME(NAME* obj, void*) override \ { ((Derived*) this)->visit##NAME(obj); } -#include "object-meta-begin.h" -#include "expr-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-expr-defs.h" +#include "slang-object-meta-end.h" #define ABSTRACT_SYNTAX_CLASS(NAME,BASE) SYNTAX_CLASS(NAME, BASE) #define SYNTAX_CLASS(NAME, BASE) \ void visit##NAME(NAME* obj) \ { ((Derived*) this)->visit##BASE(obj); } -#include "object-meta-begin.h" -#include "expr-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-expr-defs.h" +#include "slang-object-meta-end.h" }; template<typename Derived, typename Arg> @@ -203,18 +203,18 @@ struct ExprVisitorWithArg : IExprVisitor virtual void dispatch_##NAME(NAME* obj, void* arg) override \ { ((Derived*) this)->visit##NAME(obj, *(Arg*)arg); } -#include "object-meta-begin.h" -#include "expr-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-expr-defs.h" +#include "slang-object-meta-end.h" #define ABSTRACT_SYNTAX_CLASS(NAME,BASE) SYNTAX_CLASS(NAME, BASE) #define SYNTAX_CLASS(NAME, BASE) \ void visit##NAME(NAME* obj, Arg const& arg) \ { ((Derived*) this)->visit##BASE(obj, arg); } -#include "object-meta-begin.h" -#include "expr-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-expr-defs.h" +#include "slang-object-meta-end.h" }; // @@ -227,9 +227,9 @@ struct IStmtVisitor #define SYNTAX_CLASS(NAME, BASE) \ virtual void dispatch_##NAME(NAME* obj, void* extra) = 0; -#include "object-meta-begin.h" -#include "stmt-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-stmt-defs.h" +#include "slang-object-meta-end.h" }; template<typename Derived, typename Result = void> @@ -247,18 +247,18 @@ struct StmtVisitor : IStmtVisitor virtual void dispatch_##NAME(NAME* obj, void* extra) override \ { *(Result*)extra = ((Derived*) this)->visit##NAME(obj); } -#include "object-meta-begin.h" -#include "stmt-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-stmt-defs.h" +#include "slang-object-meta-end.h" #define ABSTRACT_SYNTAX_CLASS(NAME,BASE) SYNTAX_CLASS(NAME, BASE) #define SYNTAX_CLASS(NAME, BASE) \ Result visit##NAME(NAME* obj) \ { return ((Derived*) this)->visit##BASE(obj); } -#include "object-meta-begin.h" -#include "stmt-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-stmt-defs.h" +#include "slang-object-meta-end.h" }; template<typename Derived> @@ -274,18 +274,18 @@ struct StmtVisitor<Derived,void> : IStmtVisitor virtual void dispatch_##NAME(NAME* obj, void*) override \ { ((Derived*) this)->visit##NAME(obj); } -#include "object-meta-begin.h" -#include "stmt-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-stmt-defs.h" +#include "slang-object-meta-end.h" #define ABSTRACT_SYNTAX_CLASS(NAME,BASE) SYNTAX_CLASS(NAME, BASE) #define SYNTAX_CLASS(NAME, BASE) \ void visit##NAME(NAME* obj) \ { ((Derived*) this)->visit##BASE(obj); } -#include "object-meta-begin.h" -#include "stmt-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-stmt-defs.h" +#include "slang-object-meta-end.h" }; // @@ -298,9 +298,9 @@ struct IDeclVisitor #define SYNTAX_CLASS(NAME, BASE) \ virtual void dispatch_##NAME(NAME* obj, void* extra) = 0; -#include "object-meta-begin.h" -#include "decl-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-decl-defs.h" +#include "slang-object-meta-end.h" }; template<typename Derived, typename Result = void> @@ -318,18 +318,18 @@ struct DeclVisitor : IDeclVisitor virtual void dispatch_##NAME(NAME* obj, void* extra) override \ { *(Result*)extra = ((Derived*) this)->visit##NAME(obj); } -#include "object-meta-begin.h" -#include "decl-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-decl-defs.h" +#include "slang-object-meta-end.h" #define ABSTRACT_SYNTAX_CLASS(NAME,BASE) SYNTAX_CLASS(NAME, BASE) #define SYNTAX_CLASS(NAME, BASE) \ Result visit##NAME(NAME* obj) \ { return ((Derived*) this)->visit##BASE(obj); } -#include "object-meta-begin.h" -#include "decl-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-decl-defs.h" +#include "slang-object-meta-end.h" }; template<typename Derived> @@ -345,18 +345,18 @@ struct DeclVisitor<Derived,void> : IDeclVisitor virtual void dispatch_##NAME(NAME* obj, void*) override \ { ((Derived*) this)->visit##NAME(obj); } -#include "object-meta-begin.h" -#include "decl-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-decl-defs.h" +#include "slang-object-meta-end.h" #define ABSTRACT_SYNTAX_CLASS(NAME,BASE) SYNTAX_CLASS(NAME, BASE) #define SYNTAX_CLASS(NAME, BASE) \ void visit##NAME(NAME* obj) \ { ((Derived*) this)->visit##BASE(obj); } -#include "object-meta-begin.h" -#include "decl-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-decl-defs.h" +#include "slang-object-meta-end.h" }; template<typename Derived, typename Arg> @@ -372,18 +372,18 @@ struct DeclVisitorWithArg : IDeclVisitor virtual void dispatch_##NAME(NAME* obj, void* arg) override \ { ((Derived*) this)->visit##NAME(obj, *(Arg*)arg); } -#include "object-meta-begin.h" -#include "decl-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-decl-defs.h" +#include "slang-object-meta-end.h" #define ABSTRACT_SYNTAX_CLASS(NAME,BASE) SYNTAX_CLASS(NAME, BASE) #define SYNTAX_CLASS(NAME, BASE) \ void visit##NAME(NAME* obj, Arg const& arg) \ { ((Derived*) this)->visit##BASE(obj, arg); } -#include "object-meta-begin.h" -#include "decl-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-decl-defs.h" +#include "slang-object-meta-end.h" }; @@ -397,9 +397,9 @@ struct IModifierVisitor #define SYNTAX_CLASS(NAME, BASE) \ virtual void dispatch_##NAME(NAME* obj, void* extra) = 0; -#include "object-meta-begin.h" -#include "modifier-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-modifier-defs.h" +#include "slang-object-meta-end.h" }; template<typename Derived, typename Result = void> @@ -417,18 +417,18 @@ struct ModifierVisitor : IModifierVisitor virtual void dispatch_##NAME(NAME* obj, void* extra) override \ { *(Result*)extra = ((Derived*) this)->visit##NAME(obj); } -#include "object-meta-begin.h" -#include "modifier-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-modifier-defs.h" +#include "slang-object-meta-end.h" #define ABSTRACT_SYNTAX_CLASS(NAME,BASE) SYNTAX_CLASS(NAME, BASE) #define SYNTAX_CLASS(NAME, BASE) \ Result visit##NAME(NAME* obj) \ { return ((Derived*) this)->visit##BASE(obj); } -#include "object-meta-begin.h" -#include "modifier-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-modifier-defs.h" +#include "slang-object-meta-end.h" }; template<typename Derived> @@ -444,18 +444,18 @@ struct ModifierVisitor<Derived, void> : IModifierVisitor virtual void dispatch_##NAME(NAME* obj, void*) override \ { ((Derived*) this)->visit##NAME(obj); } -#include "object-meta-begin.h" -#include "modifier-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-modifier-defs.h" +#include "slang-object-meta-end.h" #define ABSTRACT_SYNTAX_CLASS(NAME,BASE) SYNTAX_CLASS(NAME, BASE) #define SYNTAX_CLASS(NAME, BASE) \ void visit##NAME(NAME* obj) \ { ((Derived*) this)->visit##BASE(obj); } -#include "object-meta-begin.h" -#include "modifier-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-modifier-defs.h" +#include "slang-object-meta-end.h" }; // @@ -468,9 +468,9 @@ struct IValVisitor : ITypeVisitor #define SYNTAX_CLASS(NAME, BASE) \ virtual void dispatch_##NAME(NAME* obj, void* extra) = 0; -#include "object-meta-begin.h" -#include "val-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-val-defs.h" +#include "slang-object-meta-end.h" }; template<typename Derived, typename Result = void, typename TypeResult = void> @@ -488,18 +488,18 @@ struct ValVisitor : TypeVisitor<Derived, TypeResult, IValVisitor> virtual void dispatch_##NAME(NAME* obj, void* extra) override \ { *(Result*)extra = ((Derived*) this)->visit##NAME(obj); } -#include "object-meta-begin.h" -#include "val-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-val-defs.h" +#include "slang-object-meta-end.h" #define ABSTRACT_SYNTAX_CLASS(NAME,BASE) SYNTAX_CLASS(NAME, BASE) #define SYNTAX_CLASS(NAME, BASE) \ Result visit##NAME(NAME* obj) \ { return ((Derived*) this)->visit##BASE(obj); } -#include "object-meta-begin.h" -#include "val-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-val-defs.h" +#include "slang-object-meta-end.h" }; template<typename Derived> @@ -515,21 +515,21 @@ struct ValVisitor<Derived, void, void> : TypeVisitor<Derived, void, IValVisitor> virtual void dispatch_##NAME(NAME* obj, void*) override \ { ((Derived*) this)->visit##NAME(obj); } -#include "object-meta-begin.h" -#include "val-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-val-defs.h" +#include "slang-object-meta-end.h" #define ABSTRACT_SYNTAX_CLASS(NAME,BASE) SYNTAX_CLASS(NAME, BASE) #define SYNTAX_CLASS(NAME, BASE) \ void visit##NAME(NAME* obj) \ { ((Derived*) this)->visit##BASE(obj); } -#include "object-meta-begin.h" -#include "val-defs.h" -#include "object-meta-end.h" +#include "slang-object-meta-begin.h" +#include "slang-val-defs.h" +#include "slang-object-meta-end.h" }; } -#endif
\ No newline at end of file +#endif 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); diff --git a/source/slang/slang.vcxproj b/source/slang/slang.vcxproj index f85aad7e0..3f10a36e1 100644 --- a/source/slang/slang.vcxproj +++ b/source/slang/slang.vcxproj @@ -171,126 +171,126 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\slang.h" /> - <ClInclude Include="check.h" /> - <ClInclude Include="compiler.h" /> <ClInclude Include="core.meta.slang.h" /> - <ClInclude Include="decl-defs.h" /> - <ClInclude Include="diagnostic-defs.h" /> - <ClInclude Include="diagnostics.h" /> - <ClInclude Include="emit.h" /> - <ClInclude Include="expr-defs.h" /> <ClInclude Include="glsl.meta.slang.h" /> <ClInclude Include="hlsl.meta.slang.h" /> - <ClInclude Include="image-format-defs.h" /> - <ClInclude Include="ir-bind-existentials.h" /> - <ClInclude Include="ir-clone.h" /> - <ClInclude Include="ir-constexpr.h" /> - <ClInclude Include="ir-dce.h" /> - <ClInclude Include="ir-dominators.h" /> - <ClInclude Include="ir-entry-point-uniforms.h" /> - <ClInclude Include="ir-glsl-legalize.h" /> - <ClInclude Include="ir-inst-defs.h" /> - <ClInclude Include="ir-insts.h" /> - <ClInclude Include="ir-link.h" /> - <ClInclude Include="ir-missing-return.h" /> - <ClInclude Include="ir-restructure-scoping.h" /> - <ClInclude Include="ir-restructure.h" /> - <ClInclude Include="ir-sccp.h" /> - <ClInclude Include="ir-serialize.h" /> - <ClInclude Include="ir-specialize-resources.h" /> - <ClInclude Include="ir-specialize.h" /> - <ClInclude Include="ir-ssa.h" /> - <ClInclude Include="ir-union.h" /> - <ClInclude Include="ir-validate.h" /> - <ClInclude Include="ir.h" /> - <ClInclude Include="legalize-types.h" /> - <ClInclude Include="lexer.h" /> - <ClInclude Include="lookup.h" /> - <ClInclude Include="lower-to-ir.h" /> - <ClInclude Include="mangle.h" /> - <ClInclude Include="modifier-defs.h" /> - <ClInclude Include="name.h" /> - <ClInclude Include="object-meta-begin.h" /> - <ClInclude Include="object-meta-end.h" /> - <ClInclude Include="parameter-binding.h" /> - <ClInclude Include="parser.h" /> - <ClInclude Include="preprocessor.h" /> - <ClInclude Include="profile-defs.h" /> - <ClInclude Include="profile.h" /> - <ClInclude Include="reflection.h" /> <ClInclude Include="slang-c-like-source-emitter.h" /> + <ClInclude Include="slang-check.h" /> + <ClInclude Include="slang-compiler.h" /> + <ClInclude Include="slang-decl-defs.h" /> + <ClInclude Include="slang-diagnostic-defs.h" /> + <ClInclude Include="slang-diagnostics.h" /> <ClInclude Include="slang-emit-context.h" /> <ClInclude Include="slang-emit-precedence.h" /> + <ClInclude Include="slang-emit.h" /> + <ClInclude Include="slang-expr-defs.h" /> <ClInclude Include="slang-extension-usage-tracker.h" /> <ClInclude Include="slang-file-system.h" /> + <ClInclude Include="slang-image-format-defs.h" /> + <ClInclude Include="slang-ir-bind-existentials.h" /> + <ClInclude Include="slang-ir-clone.h" /> + <ClInclude Include="slang-ir-constexpr.h" /> + <ClInclude Include="slang-ir-dce.h" /> + <ClInclude Include="slang-ir-dominators.h" /> + <ClInclude Include="slang-ir-entry-point-uniforms.h" /> + <ClInclude Include="slang-ir-glsl-legalize.h" /> + <ClInclude Include="slang-ir-inst-defs.h" /> + <ClInclude Include="slang-ir-insts.h" /> + <ClInclude Include="slang-ir-link.h" /> + <ClInclude Include="slang-ir-missing-return.h" /> + <ClInclude Include="slang-ir-restructure-scoping.h" /> + <ClInclude Include="slang-ir-restructure.h" /> + <ClInclude Include="slang-ir-sccp.h" /> + <ClInclude Include="slang-ir-serialize.h" /> + <ClInclude Include="slang-ir-specialize-resources.h" /> + <ClInclude Include="slang-ir-specialize.h" /> + <ClInclude Include="slang-ir-ssa.h" /> + <ClInclude Include="slang-ir-union.h" /> + <ClInclude Include="slang-ir-validate.h" /> + <ClInclude Include="slang-ir.h" /> + <ClInclude Include="slang-legalize-types.h" /> + <ClInclude Include="slang-lexer.h" /> + <ClInclude Include="slang-lookup.h" /> + <ClInclude Include="slang-lower-to-ir.h" /> + <ClInclude Include="slang-mangle.h" /> <ClInclude Include="slang-mangled-lexer.h" /> + <ClInclude Include="slang-modifier-defs.h" /> + <ClInclude Include="slang-name.h" /> + <ClInclude Include="slang-object-meta-begin.h" /> + <ClInclude Include="slang-object-meta-end.h" /> + <ClInclude Include="slang-parameter-binding.h" /> + <ClInclude Include="slang-parser.h" /> + <ClInclude Include="slang-preprocessor.h" /> + <ClInclude Include="slang-profile-defs.h" /> + <ClInclude Include="slang-profile.h" /> + <ClInclude Include="slang-reflection.h" /> + <ClInclude Include="slang-source-loc.h" /> <ClInclude Include="slang-source-stream.h" /> - <ClInclude Include="source-loc.h" /> - <ClInclude Include="stmt-defs.h" /> - <ClInclude Include="syntax-base-defs.h" /> - <ClInclude Include="syntax-defs.h" /> - <ClInclude Include="syntax-visitors.h" /> - <ClInclude Include="syntax.h" /> - <ClInclude Include="token-defs.h" /> - <ClInclude Include="token.h" /> - <ClInclude Include="type-defs.h" /> - <ClInclude Include="type-layout.h" /> - <ClInclude Include="type-system-shared.h" /> - <ClInclude Include="val-defs.h" /> - <ClInclude Include="visitor.h" /> + <ClInclude Include="slang-stmt-defs.h" /> + <ClInclude Include="slang-syntax-base-defs.h" /> + <ClInclude Include="slang-syntax-defs.h" /> + <ClInclude Include="slang-syntax-visitors.h" /> + <ClInclude Include="slang-syntax.h" /> + <ClInclude Include="slang-token-defs.h" /> + <ClInclude Include="slang-token.h" /> + <ClInclude Include="slang-type-defs.h" /> + <ClInclude Include="slang-type-layout.h" /> + <ClInclude Include="slang-type-system-shared.h" /> + <ClInclude Include="slang-val-defs.h" /> + <ClInclude Include="slang-visitor.h" /> </ItemGroup> <ItemGroup> - <ClCompile Include="check.cpp" /> - <ClCompile Include="compiler.cpp" /> - <ClCompile Include="diagnostics.cpp" /> - <ClCompile Include="dxc-support.cpp" /> - <ClCompile Include="emit.cpp" /> - <ClCompile Include="ir-bind-existentials.cpp" /> - <ClCompile Include="ir-clone.cpp" /> - <ClCompile Include="ir-constexpr.cpp" /> - <ClCompile Include="ir-dce.cpp" /> - <ClCompile Include="ir-dominators.cpp" /> - <ClCompile Include="ir-entry-point-uniforms.cpp" /> - <ClCompile Include="ir-glsl-legalize.cpp" /> - <ClCompile Include="ir-legalize-types.cpp" /> - <ClCompile Include="ir-link.cpp" /> - <ClCompile Include="ir-missing-return.cpp" /> - <ClCompile Include="ir-restructure-scoping.cpp" /> - <ClCompile Include="ir-restructure.cpp" /> - <ClCompile Include="ir-sccp.cpp" /> - <ClCompile Include="ir-serialize.cpp" /> - <ClCompile Include="ir-specialize-resources.cpp" /> - <ClCompile Include="ir-specialize.cpp" /> - <ClCompile Include="ir-ssa.cpp" /> - <ClCompile Include="ir-union.cpp" /> - <ClCompile Include="ir-validate.cpp" /> - <ClCompile Include="ir.cpp" /> - <ClCompile Include="legalize-types.cpp" /> - <ClCompile Include="lexer.cpp" /> - <ClCompile Include="lookup.cpp" /> - <ClCompile Include="lower-to-ir.cpp" /> - <ClCompile Include="mangle.cpp" /> - <ClCompile Include="name.cpp" /> - <ClCompile Include="options.cpp" /> - <ClCompile Include="parameter-binding.cpp" /> - <ClCompile Include="parser.cpp" /> - <ClCompile Include="preprocessor.cpp" /> - <ClCompile Include="profile.cpp" /> - <ClCompile Include="reflection.cpp" /> <ClCompile Include="slang-c-like-source-emitter.cpp" /> + <ClCompile Include="slang-check.cpp" /> + <ClCompile Include="slang-compiler.cpp" /> + <ClCompile Include="slang-diagnostics.cpp" /> + <ClCompile Include="slang-dxc-support.cpp" /> <ClCompile Include="slang-emit-context.cpp" /> <ClCompile Include="slang-emit-precedence.cpp" /> + <ClCompile Include="slang-emit.cpp" /> <ClCompile Include="slang-extension-usage-tracker.cpp" /> <ClCompile Include="slang-file-system.cpp" /> + <ClCompile Include="slang-ir-bind-existentials.cpp" /> + <ClCompile Include="slang-ir-clone.cpp" /> + <ClCompile Include="slang-ir-constexpr.cpp" /> + <ClCompile Include="slang-ir-dce.cpp" /> + <ClCompile Include="slang-ir-dominators.cpp" /> + <ClCompile Include="slang-ir-entry-point-uniforms.cpp" /> + <ClCompile Include="slang-ir-glsl-legalize.cpp" /> + <ClCompile Include="slang-ir-legalize-types.cpp" /> + <ClCompile Include="slang-ir-link.cpp" /> + <ClCompile Include="slang-ir-missing-return.cpp" /> + <ClCompile Include="slang-ir-restructure-scoping.cpp" /> + <ClCompile Include="slang-ir-restructure.cpp" /> + <ClCompile Include="slang-ir-sccp.cpp" /> + <ClCompile Include="slang-ir-serialize.cpp" /> + <ClCompile Include="slang-ir-specialize-resources.cpp" /> + <ClCompile Include="slang-ir-specialize.cpp" /> + <ClCompile Include="slang-ir-ssa.cpp" /> + <ClCompile Include="slang-ir-union.cpp" /> + <ClCompile Include="slang-ir-validate.cpp" /> + <ClCompile Include="slang-ir.cpp" /> + <ClCompile Include="slang-legalize-types.cpp" /> + <ClCompile Include="slang-lexer.cpp" /> + <ClCompile Include="slang-lookup.cpp" /> + <ClCompile Include="slang-lower-to-ir.cpp" /> + <ClCompile Include="slang-mangle.cpp" /> <ClCompile Include="slang-mangled-lexer.cpp" /> + <ClCompile Include="slang-name.cpp" /> + <ClCompile Include="slang-options.cpp" /> + <ClCompile Include="slang-parameter-binding.cpp" /> + <ClCompile Include="slang-parser.cpp" /> + <ClCompile Include="slang-preprocessor.cpp" /> + <ClCompile Include="slang-profile.cpp" /> + <ClCompile Include="slang-reflection.cpp" /> + <ClCompile Include="slang-source-loc.cpp" /> <ClCompile Include="slang-source-stream.cpp" /> <ClCompile Include="slang-stdlib.cpp" /> + <ClCompile Include="slang-syntax.cpp" /> + <ClCompile Include="slang-token.cpp" /> + <ClCompile Include="slang-type-layout.cpp" /> + <ClCompile Include="slang-type-system-shared.cpp" /> <ClCompile Include="slang.cpp" /> - <ClCompile Include="source-loc.cpp" /> - <ClCompile Include="syntax.cpp" /> - <ClCompile Include="token.cpp" /> - <ClCompile Include="type-layout.cpp" /> - <ClCompile Include="type-system-shared.cpp" /> </ItemGroup> <ItemGroup> <None Include="slang.natvis" /> diff --git a/source/slang/slang.vcxproj.filters b/source/slang/slang.vcxproj.filters index f08395da7..7103749c0 100644 --- a/source/slang/slang.vcxproj.filters +++ b/source/slang/slang.vcxproj.filters @@ -12,360 +12,360 @@ <ClInclude Include="..\..\slang.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="check.h"> + <ClInclude Include="core.meta.slang.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="compiler.h"> + <ClInclude Include="glsl.meta.slang.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="core.meta.slang.h"> + <ClInclude Include="hlsl.meta.slang.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="decl-defs.h"> + <ClInclude Include="slang-c-like-source-emitter.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="diagnostic-defs.h"> + <ClInclude Include="slang-check.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="diagnostics.h"> + <ClInclude Include="slang-compiler.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="emit.h"> + <ClInclude Include="slang-decl-defs.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="expr-defs.h"> + <ClInclude Include="slang-diagnostic-defs.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="glsl.meta.slang.h"> + <ClInclude Include="slang-diagnostics.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="hlsl.meta.slang.h"> + <ClInclude Include="slang-emit-context.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="image-format-defs.h"> + <ClInclude Include="slang-emit-precedence.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ir-bind-existentials.h"> + <ClInclude Include="slang-emit.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ir-clone.h"> + <ClInclude Include="slang-expr-defs.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ir-constexpr.h"> + <ClInclude Include="slang-extension-usage-tracker.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ir-dce.h"> + <ClInclude Include="slang-file-system.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ir-dominators.h"> + <ClInclude Include="slang-image-format-defs.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ir-entry-point-uniforms.h"> + <ClInclude Include="slang-ir-bind-existentials.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ir-glsl-legalize.h"> + <ClInclude Include="slang-ir-clone.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ir-inst-defs.h"> + <ClInclude Include="slang-ir-constexpr.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ir-insts.h"> + <ClInclude Include="slang-ir-dce.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ir-link.h"> + <ClInclude Include="slang-ir-dominators.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ir-missing-return.h"> + <ClInclude Include="slang-ir-entry-point-uniforms.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ir-restructure-scoping.h"> + <ClInclude Include="slang-ir-glsl-legalize.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ir-restructure.h"> + <ClInclude Include="slang-ir-inst-defs.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ir-sccp.h"> + <ClInclude Include="slang-ir-insts.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ir-serialize.h"> + <ClInclude Include="slang-ir-link.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ir-specialize-resources.h"> + <ClInclude Include="slang-ir-missing-return.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ir-specialize.h"> + <ClInclude Include="slang-ir-restructure-scoping.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ir-ssa.h"> + <ClInclude Include="slang-ir-restructure.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ir-union.h"> + <ClInclude Include="slang-ir-sccp.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ir-validate.h"> + <ClInclude Include="slang-ir-serialize.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ir.h"> + <ClInclude Include="slang-ir-specialize-resources.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="legalize-types.h"> + <ClInclude Include="slang-ir-specialize.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="lexer.h"> + <ClInclude Include="slang-ir-ssa.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="lookup.h"> + <ClInclude Include="slang-ir-union.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="lower-to-ir.h"> + <ClInclude Include="slang-ir-validate.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="mangle.h"> + <ClInclude Include="slang-ir.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="modifier-defs.h"> + <ClInclude Include="slang-legalize-types.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="name.h"> + <ClInclude Include="slang-lexer.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="object-meta-begin.h"> + <ClInclude Include="slang-lookup.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="object-meta-end.h"> + <ClInclude Include="slang-lower-to-ir.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="parameter-binding.h"> + <ClInclude Include="slang-mangle.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="parser.h"> + <ClInclude Include="slang-mangled-lexer.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="preprocessor.h"> + <ClInclude Include="slang-modifier-defs.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="profile-defs.h"> + <ClInclude Include="slang-name.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="profile.h"> + <ClInclude Include="slang-object-meta-begin.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="reflection.h"> + <ClInclude Include="slang-object-meta-end.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="slang-c-like-source-emitter.h"> + <ClInclude Include="slang-parameter-binding.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="slang-emit-context.h"> + <ClInclude Include="slang-parser.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="slang-emit-precedence.h"> + <ClInclude Include="slang-preprocessor.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="slang-extension-usage-tracker.h"> + <ClInclude Include="slang-profile-defs.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="slang-file-system.h"> + <ClInclude Include="slang-profile.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="slang-mangled-lexer.h"> + <ClInclude Include="slang-reflection.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="slang-source-stream.h"> + <ClInclude Include="slang-source-loc.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="source-loc.h"> + <ClInclude Include="slang-source-stream.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="stmt-defs.h"> + <ClInclude Include="slang-stmt-defs.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="syntax-base-defs.h"> + <ClInclude Include="slang-syntax-base-defs.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="syntax-defs.h"> + <ClInclude Include="slang-syntax-defs.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="syntax-visitors.h"> + <ClInclude Include="slang-syntax-visitors.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="syntax.h"> + <ClInclude Include="slang-syntax.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="token-defs.h"> + <ClInclude Include="slang-token-defs.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="token.h"> + <ClInclude Include="slang-token.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="type-defs.h"> + <ClInclude Include="slang-type-defs.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="type-layout.h"> + <ClInclude Include="slang-type-layout.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="type-system-shared.h"> + <ClInclude Include="slang-type-system-shared.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="val-defs.h"> + <ClInclude Include="slang-val-defs.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="visitor.h"> + <ClInclude Include="slang-visitor.h"> <Filter>Header Files</Filter> </ClInclude> </ItemGroup> <ItemGroup> - <ClCompile Include="check.cpp"> + <ClCompile Include="slang-c-like-source-emitter.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="compiler.cpp"> + <ClCompile Include="slang-check.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="diagnostics.cpp"> + <ClCompile Include="slang-compiler.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="dxc-support.cpp"> + <ClCompile Include="slang-diagnostics.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="emit.cpp"> + <ClCompile Include="slang-dxc-support.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="ir-bind-existentials.cpp"> + <ClCompile Include="slang-emit-context.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="ir-clone.cpp"> + <ClCompile Include="slang-emit-precedence.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="ir-constexpr.cpp"> + <ClCompile Include="slang-emit.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="ir-dce.cpp"> + <ClCompile Include="slang-extension-usage-tracker.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="ir-dominators.cpp"> + <ClCompile Include="slang-file-system.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="ir-entry-point-uniforms.cpp"> + <ClCompile Include="slang-ir-bind-existentials.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="ir-glsl-legalize.cpp"> + <ClCompile Include="slang-ir-clone.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="ir-legalize-types.cpp"> + <ClCompile Include="slang-ir-constexpr.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="ir-link.cpp"> + <ClCompile Include="slang-ir-dce.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="ir-missing-return.cpp"> + <ClCompile Include="slang-ir-dominators.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="ir-restructure-scoping.cpp"> + <ClCompile Include="slang-ir-entry-point-uniforms.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="ir-restructure.cpp"> + <ClCompile Include="slang-ir-glsl-legalize.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="ir-sccp.cpp"> + <ClCompile Include="slang-ir-legalize-types.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="ir-serialize.cpp"> + <ClCompile Include="slang-ir-link.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="ir-specialize-resources.cpp"> + <ClCompile Include="slang-ir-missing-return.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="ir-specialize.cpp"> + <ClCompile Include="slang-ir-restructure-scoping.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="ir-ssa.cpp"> + <ClCompile Include="slang-ir-restructure.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="ir-union.cpp"> + <ClCompile Include="slang-ir-sccp.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="ir-validate.cpp"> + <ClCompile Include="slang-ir-serialize.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="ir.cpp"> + <ClCompile Include="slang-ir-specialize-resources.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="legalize-types.cpp"> + <ClCompile Include="slang-ir-specialize.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="lexer.cpp"> + <ClCompile Include="slang-ir-ssa.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="lookup.cpp"> + <ClCompile Include="slang-ir-union.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="lower-to-ir.cpp"> + <ClCompile Include="slang-ir-validate.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="mangle.cpp"> + <ClCompile Include="slang-ir.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="name.cpp"> + <ClCompile Include="slang-legalize-types.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="options.cpp"> + <ClCompile Include="slang-lexer.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="parameter-binding.cpp"> + <ClCompile Include="slang-lookup.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="parser.cpp"> + <ClCompile Include="slang-lower-to-ir.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="preprocessor.cpp"> + <ClCompile Include="slang-mangle.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="profile.cpp"> + <ClCompile Include="slang-mangled-lexer.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="reflection.cpp"> + <ClCompile Include="slang-name.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="slang-c-like-source-emitter.cpp"> + <ClCompile Include="slang-options.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="slang-emit-context.cpp"> + <ClCompile Include="slang-parameter-binding.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="slang-emit-precedence.cpp"> + <ClCompile Include="slang-parser.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="slang-extension-usage-tracker.cpp"> + <ClCompile Include="slang-preprocessor.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="slang-file-system.cpp"> + <ClCompile Include="slang-profile.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="slang-mangled-lexer.cpp"> + <ClCompile Include="slang-reflection.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="slang-source-stream.cpp"> + <ClCompile Include="slang-source-loc.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="slang-stdlib.cpp"> + <ClCompile Include="slang-source-stream.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="slang.cpp"> + <ClCompile Include="slang-stdlib.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="source-loc.cpp"> + <ClCompile Include="slang-syntax.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="syntax.cpp"> + <ClCompile Include="slang-token.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="token.cpp"> + <ClCompile Include="slang-type-layout.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="type-layout.cpp"> + <ClCompile Include="slang-type-system-shared.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="type-system-shared.cpp"> + <ClCompile Include="slang.cpp"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> diff --git a/source/slang/syntax-defs.h b/source/slang/syntax-defs.h deleted file mode 100644 index 4ff4a55a6..000000000 --- a/source/slang/syntax-defs.h +++ /dev/null @@ -1,10 +0,0 @@ -// syntax-defs.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" diff --git a/tools/gfx/circular-resource-heap-d3d12.h b/tools/gfx/circular-resource-heap-d3d12.h index cca981601..bf9f412cf 100644 --- a/tools/gfx/circular-resource-heap-d3d12.h +++ b/tools/gfx/circular-resource-heap-d3d12.h @@ -1,7 +1,7 @@ -#pragma once +#pragma once #include "../../slang-com-ptr.h" -#include "../../source/core/list.h" +#include "../../source/core/slang-list.h" #include "../../source/core/slang-free-list.h" #include "resource-d3d12.h" diff --git a/tools/gfx/d3d-util.h b/tools/gfx/d3d-util.h index 0c05bed46..6bcee054c 100644 --- a/tools/gfx/d3d-util.h +++ b/tools/gfx/d3d-util.h @@ -1,4 +1,4 @@ -// d3d-util.h +// d3d-util.h #pragma once #include <stdint.h> @@ -6,7 +6,7 @@ #include "../../slang-com-helper.h" #include "../../slang-com-ptr.h" -#include "../../source/core/list.h" +#include "../../source/core/slang-list.h" #include "flag-combiner.h" diff --git a/tools/gfx/descriptor-heap-d3d12.h b/tools/gfx/descriptor-heap-d3d12.h index 638c1f752..a546395d8 100644 --- a/tools/gfx/descriptor-heap-d3d12.h +++ b/tools/gfx/descriptor-heap-d3d12.h @@ -5,7 +5,7 @@ #include <d3d12.h> #include "../../slang-com-ptr.h" -#include "../../source/core/list.h" +#include "../../source/core/slang-list.h" namespace gfx { diff --git a/tools/gfx/flag-combiner.h b/tools/gfx/flag-combiner.h index 83962d2dd..db8c6863b 100644 --- a/tools/gfx/flag-combiner.h +++ b/tools/gfx/flag-combiner.h @@ -1,7 +1,7 @@ #ifndef GFX_FLAG_COMBINER_H #define GFX_FLAG_COMBINER_H -#include "../../source/core/list.h" +#include "../../source/core/slang-list.h" namespace gfx { diff --git a/tools/gfx/render-gl.cpp b/tools/gfx/render-gl.cpp index c20eb7e6d..3249b8620 100644 --- a/tools/gfx/render-gl.cpp +++ b/tools/gfx/render-gl.cpp @@ -6,8 +6,8 @@ #include <stdio.h> #include <stdlib.h> -#include "core/basic.h" -#include "core/secure-crt.h" +#include "core/slang-basic.h" +#include "core/slang-secure-crt.h" #include "external/stb/stb_image_write.h" #include "surface.h" diff --git a/tools/gfx/render-vk.cpp b/tools/gfx/render-vk.cpp index c76a8e42d..77b593565 100644 --- a/tools/gfx/render-vk.cpp +++ b/tools/gfx/render-vk.cpp @@ -4,7 +4,7 @@ //WORKING:#include "options.h" #include "render.h" -#include "../../source/core/smart-pointer.h" +#include "../../source/core/slang-smart-pointer.h" #include "vk-api.h" #include "vk-util.h" diff --git a/tools/gfx/render.h b/tools/gfx/render.h index 292b4f8f8..247932bd5 100644 --- a/tools/gfx/render.h +++ b/tools/gfx/render.h @@ -9,9 +9,9 @@ #include "../../slang-com-helper.h" -#include "../../source/core/smart-pointer.h" -#include "../../source/core/list.h" -#include "../../source/core/dictionary.h" +#include "../../source/core/slang-smart-pointer.h" +#include "../../source/core/slang-list.h" +#include "../../source/core/slang-dictionary.h" #include "../../slang.h" diff --git a/tools/gfx/surface.cpp b/tools/gfx/surface.cpp index 63fd7087c..28fe744de 100644 --- a/tools/gfx/surface.cpp +++ b/tools/gfx/surface.cpp @@ -4,7 +4,7 @@ #include <stdlib.h> #include <stdio.h> -#include "../../source/core/list.h" +#include "../../source/core/slang-list.h" namespace gfx { using namespace Slang; diff --git a/tools/gfx/vk-api.cpp b/tools/gfx/vk-api.cpp index 304513d24..50f80aa26 100644 --- a/tools/gfx/vk-api.cpp +++ b/tools/gfx/vk-api.cpp @@ -1,7 +1,7 @@ // vk-api.cpp #include "vk-api.h" -#include "../../source/core/list.h" +#include "../../source/core/slang-list.h" namespace gfx { using namespace Slang; diff --git a/tools/gfx/vk-swap-chain.cpp b/tools/gfx/vk-swap-chain.cpp index bde68c413..5cf2e96ae 100644 --- a/tools/gfx/vk-swap-chain.cpp +++ b/tools/gfx/vk-swap-chain.cpp @@ -3,7 +3,7 @@ #include "vk-util.h" -#include "../../source/core/list.h" +#include "../../source/core/slang-list.h" #include <stdlib.h> #include <stdio.h> diff --git a/tools/gfx/vk-swap-chain.h b/tools/gfx/vk-swap-chain.h index ad2357315..f8ad98a83 100644 --- a/tools/gfx/vk-swap-chain.h +++ b/tools/gfx/vk-swap-chain.h @@ -6,7 +6,7 @@ #include "render.h" -#include "../../source/core/list.h" +#include "../../source/core/slang-list.h" namespace gfx { diff --git a/tools/render-test/options.cpp b/tools/render-test/options.cpp index 17ba864f7..9423b5b6e 100644 --- a/tools/render-test/options.cpp +++ b/tools/render-test/options.cpp @@ -9,7 +9,7 @@ #include "../../source/core/slang-writer.h" #include "../../source/core/slang-render-api-util.h" -#include "../../source/core/list.h" +#include "../../source/core/slang-list.h" #include "../../source/core/slang-string-util.h" namespace renderer_test { diff --git a/tools/render-test/shader-input-layout.cpp b/tools/render-test/shader-input-layout.cpp index 644b0889e..8205c979e 100644 --- a/tools/render-test/shader-input-layout.cpp +++ b/tools/render-test/shader-input-layout.cpp @@ -1,5 +1,5 @@ #include "shader-input-layout.h" -#include "core/token-reader.h" +#include "core/slang-token-reader.h" #include "render.h" diff --git a/tools/render-test/shader-input-layout.h b/tools/render-test/shader-input-layout.h index d9188fadd..d5a1b6fd5 100644 --- a/tools/render-test/shader-input-layout.h +++ b/tools/render-test/shader-input-layout.h @@ -1,7 +1,7 @@ #ifndef SLANG_TEST_SHADER_INPUT_LAYOUT_H #define SLANG_TEST_SHADER_INPUT_LAYOUT_H -#include "core/basic.h" +#include "core/slang-basic.h" #include "render.h" diff --git a/tools/slang-generate/main.cpp b/tools/slang-generate/main.cpp index ed5af370b..ddd087072 100644 --- a/tools/slang-generate/main.cpp +++ b/tools/slang-generate/main.cpp @@ -3,9 +3,9 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include "../../source/core/secure-crt.h" +#include "../../source/core/slang-secure-crt.h" -#include "../../source/core/list.h" +#include "../../source/core/slang-list.h" #include "../../source/core/slang-string.h" using namespace Slang; 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; |