From fbae51ff49eeb6b6494be5412b52da1273ad61be Mon Sep 17 00:00:00 2001
From: Tim Foley <tfoley@nvidia.com>
Date: Mon, 17 Jul 2017 09:47:23 -0700
Subject: Skip unknown types during parameter-binding/-reflection step

Work on #105

If a semantic error occurs in the type of an entry-point parameter, we need to be able to skip over it when doing parameter binding and reflection-generation work.
---
 source/slang/parameter-binding.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'source')

diff --git a/source/slang/parameter-binding.cpp b/source/slang/parameter-binding.cpp
index 007c023e2..8a8a993cd 100644
--- a/source/slang/parameter-binding.cpp
+++ b/source/slang/parameter-binding.cpp
@@ -994,6 +994,11 @@ static RefPtr<TypeLayout> processEntryPointParameter(
             assert(!"unimplemented");
         }
     }
+    // If we ran into an error in checking the user's code, then skip this parameter
+    else if( auto errorType = type->As<ErrorType>() )
+    {
+        return nullptr;
+    }
     else
     {
         assert(!"unimplemented");
@@ -1090,6 +1095,10 @@ static void collectEntryPointParameters(
             state,
             paramVarLayout);
 
+        // Skip parameters for which we could not compute a layout
+        if(!paramTypeLayout)
+            continue;
+
         paramVarLayout->typeLayout = paramTypeLayout;
 
         for (auto rr : paramTypeLayout->resourceInfos)
-- 
cgit v1.2.3


From f23738e58dadcaab0503c6cba1d9c7819153080a Mon Sep 17 00:00:00 2001
From: Tim Foley <tfoley@nvidia.com>
Date: Mon, 17 Jul 2017 09:48:45 -0700
Subject: Fix AST node type for `TriangleStream`

- This was being mapped to `HLSLLineStreamType` because of a copy-paste typo
---
 source/slang/slang-stdlib.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source')

diff --git a/source/slang/slang-stdlib.cpp b/source/slang/slang-stdlib.cpp
index 3450e72d7..7c155a1e5 100644
--- a/source/slang/slang-stdlib.cpp
+++ b/source/slang/slang-stdlib.cpp
@@ -264,7 +264,7 @@ __generic<T> __magic_type(HLSLLineStreamType) struct LineStream
     void RestartStrip();
 };
 
-__generic<T> __magic_type(HLSLLineStreamType) struct TriangleStream
+__generic<T> __magic_type(HLSLTriangleStreamType) struct TriangleStream
 {
     void Append(T value);
     void RestartStrip();
-- 
cgit v1.2.3


From 782e6f0f675fd858acfdc66e5ea1fa46a646df71 Mon Sep 17 00:00:00 2001
From: Tim Foley <tfoley@nvidia.com>
Date: Mon, 17 Jul 2017 09:49:32 -0700
Subject: Add emit logic for generic app expressions

Work on #105

These can occur in unchecked code (or code that had a semantic error), so we need to be able to handle them.
---
 source/slang/emit.cpp | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

(limited to 'source')

diff --git a/source/slang/emit.cpp b/source/slang/emit.cpp
index 7ffce2acd..8c6a46196 100644
--- a/source/slang/emit.cpp
+++ b/source/slang/emit.cpp
@@ -1495,14 +1495,28 @@ struct EmitVisitor
         outerPrec.rightPrecedence = rightPrec;
     }
 
+    void visitGenericAppExpr(GenericAppExpr* expr, ExprEmitArg const& arg)
+    {
+        auto prec = kEOp_Postfix;
+        auto outerPrec = arg.outerPrec;
+        bool needClose = MaybeEmitParens(outerPrec, prec);
 
-#define UNEXPECTED(NAME)                        \
-    void visit##NAME(NAME*, ExprEmitArg const&) \
-    { Emit(#NAME); }
-
-    UNEXPECTED(GenericAppExpr);
+        EmitExprWithPrecedence(expr->FunctionExpr, leftSide(outerPrec, prec));
+        Emit("<");
+        bool first = true;
+        for(auto aa : expr->Arguments)
+        {
+            if(!first) Emit(", ");
+            EmitExpr(aa);
+            first = false;
+        }
+        Emit(" >");
 
-#undef UNEXPECTED
+        if(needClose)
+        {
+            Emit(")");
+        }
+    }
 
     void visitSharedTypeExpr(SharedTypeExpr* expr, ExprEmitArg const&)
     {
-- 
cgit v1.2.3