From 643aaa13d2c6e0c4994437aa9fba6716787608ce Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Fri, 7 Jul 2023 14:26:37 -0700
Subject: Make DeclRefBase a Val, and DeclRef<T> a helper class. (#2967)

* Make DeclRefBase a Val, and DeclRef<T> a helper class.

* Fixes.

* Workaround gcc parser issue.

* Revert NodeOperand change.

* Fix.

* Fix clang incomplete class complains.

* Fix code review.

* Small cleanups and improvements.

---------

Co-authored-by: Yong He <yhe@nvidia.com>
---
 source/slang/slang-ast-print.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'source/slang/slang-ast-print.cpp')

diff --git a/source/slang/slang-ast-print.cpp b/source/slang/slang-ast-print.cpp
index bc0410fee..65c3a23c9 100644
--- a/source/slang/slang-ast-print.cpp
+++ b/source/slang/slang-ast-print.cpp
@@ -172,7 +172,7 @@ void ASTPrinter::_addDeclPathRec(const DeclRef<Decl>& declRef, Index depth)
         !declRef.as<GenericValueParamDecl>() &&
         !declRef.as<GenericTypeParamDecl>())
     {
-        auto genSubst = as<GenericSubstitution>(declRef.substitutions.substitutions);
+        auto genSubst = as<GenericSubstitution>(declRef.getSubst());
         if (genSubst)
         {
             SLANG_RELEASE_ASSERT(genSubst);
@@ -276,7 +276,7 @@ void ASTPrinter::addDeclParams(const DeclRef<Decl>& declRef, List<Range<Index>>*
 
             auto rangeStart = sb.getLength();
 
-            ParamDecl* paramDecl = paramDeclRef;
+            ParamDecl* paramDecl = paramDeclRef.getDecl();
 
             {
                 ScopePart scopePart(this, Part::Type::ParamType);
@@ -331,7 +331,7 @@ void ASTPrinter::addDeclParams(const DeclRef<Decl>& declRef, List<Range<Index>>*
     {
         addGenericParams(genericDeclRef);
 
-        addDeclParams(m_astBuilder->getSpecializedDeclRef<Decl>(getInner(genericDeclRef), genericDeclRef.substitutions), outParamRange);
+        addDeclParams(m_astBuilder->getSpecializedDeclRef<Decl>(getInner(genericDeclRef), genericDeclRef.getSubst()), outParamRange);
     }
     else
     {
@@ -443,10 +443,10 @@ void ASTPrinter::addDeclResultType(const DeclRef<Decl>& inDeclRef)
     DeclRef<Decl> declRef = inDeclRef;
     if (auto genericDeclRef = declRef.as<GenericDecl>())
     {
-        declRef = m_astBuilder->getSpecializedDeclRef<Decl>(getInner(genericDeclRef), genericDeclRef.substitutions);
+        declRef = m_astBuilder->getSpecializedDeclRef<Decl>(getInner(genericDeclRef), genericDeclRef.getSubst());
     }
 
-    if (as<ConstructorDecl>(declRef))
+    if (declRef.as<ConstructorDecl>())
     {
     }
     else if (auto callableDeclRef = declRef.as<CallableDecl>())
-- 
cgit v1.2.3