Merge pull request #372 from csyonghe/master

Allow type expression as type argument, fix global param enum order

1 files changed, 4 insertions, 2 deletions

diff --git a/source/slang/syntax.cpp b/source/slang/syntax.cpp
index 552f1dc56..ab4a5f94c 100644
--- a/source/slang/syntax.cpp
+++ b/source/slang/syntax.cpp
@@ -355,19 +355,21 @@ void Type::accept(IValVisitor* visitor, void* extra)
         auto arrType = type->AsArrayType();
         if (!arrType)
             return false;
-        return (ArrayLength == arrType->ArrayLength && baseType->Equals(arrType->baseType.Ptr()));
+        return (ArrayLength->EqualsVal(arrType->ArrayLength) && baseType->Equals(arrType->baseType.Ptr()));
     }
 
     RefPtr<Val> ArrayExpressionType::SubstituteImpl(SubstitutionSet subst, int* ioDiff)
     {
         int diff = 0;
         auto elementType = baseType->SubstituteImpl(subst, &diff).As<Type>();
+        auto arrlen = ArrayLength->SubstituteImpl(subst, &diff).As<IntVal>();
+        SLANG_ASSERT(arrlen);
         if (diff)
         {
             *ioDiff = 1;
             auto rsType = getArrayType(
                 elementType,
-                ArrayLength);
+                arrlen);
             return rsType;
         }
         return this;