diff options
| author | Tim Foley <tim.foley.is@gmail.com> | 2017-08-14 18:50:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-14 18:50:46 -0700 |
| commit | aeb247cdf02e4dcfc0bb6839cfd291be5128f8ad (patch) | |
| tree | 7314b26e21ded966b6a4fe2430f0421c0c0970bd /source/slang/syntax.cpp | |
| parent | bb66d6eddd649d8861cecefa2d6ccb7a28a827bc (diff) | |
| parent | 9885c972a6bfa6f856e505cdd90d9b71fdbdadaf (diff) | |
Merge pull request #159 from tfoleyNV/name-type
Name type
Diffstat (limited to 'source/slang/syntax.cpp')
| -rw-r--r-- | source/slang/syntax.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/slang/syntax.cpp b/source/slang/syntax.cpp index 2bd6c122c..be1a429a6 100644 --- a/source/slang/syntax.cpp +++ b/source/slang/syntax.cpp @@ -260,7 +260,7 @@ void Type::accept(IValVisitor* visitor, void* extra) return errorType; } - SyntaxClass<RefObject> Session::findSyntaxClass(String const& name) + SyntaxClass<RefObject> Session::findSyntaxClass(Name* name) { SyntaxClass<RefObject> syntaxClass; if (mapNameToSyntaxClass.TryGetValue(name, syntaxClass)) @@ -306,7 +306,7 @@ void Type::accept(IValVisitor* visitor, void* extra) String DeclRefType::ToString() { - return declRef.GetName(); + return getText(declRef.GetName()); } int DeclRefType::GetHashCode() @@ -620,7 +620,7 @@ void Type::accept(IValVisitor* visitor, void* extra) String NamedExpressionType::ToString() { - return declRef.GetName(); + return getText(declRef.GetName()); } bool NamedExpressionType::EqualsImpl(Type * /*type*/) @@ -646,7 +646,7 @@ void Type::accept(IValVisitor* visitor, void* extra) { // TODO: a better approach than this if (declRef) - return declRef.GetName(); + return getText(declRef.GetName()); else return "/* unknown FuncType */"; } @@ -786,7 +786,7 @@ void Type::accept(IValVisitor* visitor, void* extra) String GenericParamIntVal::ToString() { - return declRef.GetName(); + return getText(declRef.GetName()); } int GenericParamIntVal::GetHashCode() @@ -947,9 +947,9 @@ void Type::accept(IValVisitor* visitor, void* extra) } // Convenience accessors for common properties of declarations - String const& DeclRefBase::GetName() const + Name* DeclRefBase::GetName() const { - return decl->Name.Content; + return decl->nameAndLoc.name; } DeclRefBase DeclRefBase::GetParent() const |