Merge pull request #159 from tfoleyNV/name-type

Name type

1 files changed, 4 insertions, 6 deletions

diff --git a/source/slang/diagnostics.h b/source/slang/diagnostics.h
index e22320d3d..f92df030b 100644
--- a/source/slang/diagnostics.h
+++ b/source/slang/diagnostics.h
@@ -46,7 +46,7 @@ namespace Slang
     {
     public:
         String Message;
-        SourceLoc Position;
+        SourceLoc loc;
         int ErrorID;
         Severity severity;
 
@@ -63,15 +63,13 @@ namespace Slang
         {
             Message = msg;
             ErrorID = id;
-            Position = pos;
+            loc = pos;
         }
     };
 
+    class Name;
     class Decl;
-    class type;
     class Type;
-    class ILType;
-    class StageAttribute;
     struct TypeExp;
     struct QualType;
 
@@ -79,8 +77,8 @@ namespace Slang
     void printDiagnosticArg(StringBuilder& sb, int val);
     void printDiagnosticArg(StringBuilder& sb, UInt val);
     void printDiagnosticArg(StringBuilder& sb, Slang::String const& str);
+    void printDiagnosticArg(StringBuilder& sb, Name* name);
     void printDiagnosticArg(StringBuilder& sb, Decl* decl);
-    void printDiagnosticArg(StringBuilder& sb, type* type);
     void printDiagnosticArg(StringBuilder& sb, Type* type);
     void printDiagnosticArg(StringBuilder& sb, TypeExp const& type);
     void printDiagnosticArg(StringBuilder& sb, QualType const& type);