From 9914ca800c92e9b3fe768dec4e913a302f3d678d Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Tue, 31 Jul 2018 11:03:53 -0400
Subject: Feature/attributed binding (#621)

* Typo fix, and added dxc to command line documentation.

* Fix small typos.
Added support for Scope to lexer.
Fix bug in Token ctor.

* Add support for attribute names that are scoped.

* Added GLSLBindingAttribute. Make binding work through core.met.slang.

* Allow [[gl::binding(binding, set)]]
[[vk::binding(binding,set)]]
---
 source/slang/token.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'source/slang/token.h')

diff --git a/source/slang/token.h b/source/slang/token.h
index 5967ac49a..e3b6f48ff 100644
--- a/source/slang/token.h
+++ b/source/slang/token.h
@@ -41,15 +41,15 @@ public:
     Token() = default;
 
     Token(
-        TokenType type,
-        const String & content,
-        SourceLoc loc,
-        TokenFlags flags = 0)
-        : flags(flags)
+        TokenType typeIn,
+        const String & contentIn,
+        SourceLoc locIn,
+        TokenFlags flagsIn = 0)
+        : flags(flagsIn)
 	{
-		type = type;
-		Content = content;
-        loc = loc;
+		type = typeIn;
+		Content = contentIn;
+        loc = locIn;
         ptrValue = nullptr;
 	}
 
-- 
cgit v1.2.3