Removed spGetTranslationUnitCode; Unified EntryPointResult/TranslationUnitResult, added helper functionality; Ensure null termination when printing raw data

1 files changed, 22 insertions, 11 deletions

diff --git a/source/slang/compiler.h b/source/slang/compiler.h
index 3763faec7..2b440ad85 100644
--- a/source/slang/compiler.h
+++ b/source/slang/compiler.h
@@ -48,13 +48,30 @@ namespace Slang
         ReflectionJSON      = SLANG_REFLECTION_JSON,
     };
 
+    enum class ResultFormat
+    {
+        None,
+        Text,
+        Binary
+    };
+
     class CompileRequest;
     class TranslationUnitRequest;
 
-    // Result of compiling an entry point
-    struct EntryPointResult
+    // Result of compiling an entry point.
+    // Should only ever be string OR binary.
+    class CompileResult
     {
-        List<uint8_t> outputSource;
+    public:
+        CompileResult() = default;
+        CompileResult(String const& str) : format(ResultFormat::Text), outputString(str) {}
+        CompileResult(List<uint8_t> const& buffer) : format(ResultFormat::Binary), outputBinary(buffer) {}
+
+        void append(CompileResult const& result);
+
+        ResultFormat format = ResultFormat::None;
+        String outputString;
+        List<uint8_t> outputBinary;
     };
 
     // Describes an entry point that we've been requested to compile
@@ -80,7 +97,7 @@ namespace Slang
         // The resulting output for the enry point
         //
         // TODO: low-level code generation should be a distinct step
-        EntryPointResult result;
+        CompileResult result;
 
         // The translation unit that this entry point came from
         TranslationUnitRequest* getTranslationUnit();
@@ -105,12 +122,6 @@ namespace Slang
         String content;
     };
 
-    // Result of compiling a translation unit
-    struct TranslationUnitResult
-    {
-        List<uint8_t> outputSource;
-    };
-
     // A single translation unit requested to be compiled.
     //
     class TranslationUnitRequest : public RefObject
@@ -144,7 +155,7 @@ namespace Slang
         // The resulting output for the translation unit
         //
         // TODO: low-level code generation should be a distinct step
-        TranslationUnitResult result;
+        CompileResult result;
     };
 
     // A directory to be searched when looking for files (e.g., `#include`)