1 files changed, 33 insertions, 4 deletions
diff --git a/source/slang/parser.cpp b/source/slang/parser.cpp
index 322f403e6..224450a66 100644
--- a/source/slang/parser.cpp
+++ b/source/slang/parser.cpp
@@ -1396,6 +1396,16 @@ namespace Slang
         return genericApp;
     }
 
+    static RefPtr<Expr> parseMemberType(Parser * parser, RefPtr<Expr> base)
+    {
+        RefPtr<MemberExpr> memberExpr = new MemberExpr();
+        parser->ReadToken(TokenType::Dot);
+        parser->FillPosition(memberExpr.Ptr());
+        memberExpr->BaseExpression = base;
+        memberExpr->name = expectIdentifier(parser).name;
+        return memberExpr;
+    }
+
     // Parse option `[]` braces after a type expression, that indicate an array type
     static RefPtr<Expr> parsePostfixTypeSuffix(
         Parser* parser,
@@ -1452,9 +1462,16 @@ namespace Slang
 
         RefPtr<Expr> typeExpr = basicType;
 
-        if (parser->LookAheadToken(TokenType::OpLess))
+        while (parser->LookAheadToken(TokenType::OpLess) || parser->LookAheadToken(TokenType::Dot))
         {
-            typeExpr = parseGenericApp(parser, typeExpr);
+            if (parser->LookAheadToken(TokenType::OpLess))
+            {
+                typeExpr = parseGenericApp(parser, typeExpr);
+            }
+            else
+            {
+                typeExpr = parseMemberType(parser, typeExpr);
+            }
         }
 
         // GLSL allows `[]` directly in a type specifier
@@ -2070,7 +2087,7 @@ namespace Slang
         return decl;
     }
 
-    static void parseOptionalInheritanceClause(Parser* parser, AggTypeDecl* decl)
+    static void parseOptionalInheritanceClause(Parser* parser, ContainerDecl* decl)
     {
         if( AdvanceIf(parser, TokenType::Colon) )
         {
@@ -2089,6 +2106,18 @@ namespace Slang
         }
     }
 
+    RefPtr<RefObject> ParseAssocType(Parser * parser, void *)
+    {
+        RefPtr<AssocTypeDecl> assocTypeDecl = new AssocTypeDecl();
+
+        auto nameToken = parser->ReadToken(TokenType::Identifier);
+        assocTypeDecl->nameAndLoc = NameLoc(nameToken);
+        assocTypeDecl->loc = nameToken.loc;
+        parseOptionalInheritanceClause(parser, assocTypeDecl.Ptr());
+        parser->ReadToken(TokenType::Semicolon);
+        return assocTypeDecl;
+    }
+
     static RefPtr<RefObject> parseInterfaceDecl(Parser* parser, void* /*userData*/)
     {
         RefPtr<InterfaceDecl> decl = new InterfaceDecl();
@@ -4029,8 +4058,8 @@ namespace Slang
         // Add syntax for declaration keywords
     #define DECL(KEYWORD, CALLBACK) \
         addBuiltinSyntax<Decl>(session, scope, #KEYWORD, &CALLBACK)
-
         DECL(typedef,       ParseTypeDef);
+        DECL(associatedtype,ParseAssocType);
         DECL(cbuffer,       parseHLSLCBufferDecl);
         DECL(tbuffer,       parseHLSLTBufferDecl);
         DECL(__generic,     ParseGenericDecl);