diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2018-07-31 11:03:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-31 11:03:53 -0400 |
| commit | 9914ca800c92e9b3fe768dec4e913a302f3d678d (patch) | |
| tree | 49544fb2c0387f39876fd99e112cfc32ed05302d /source/slang/token.h | |
| parent | 171f524d7ca2922084a33f50c77a1e8797e80949 (diff) | |
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)]]
Diffstat (limited to 'source/slang/token.h')
| -rw-r--r-- | source/slang/token.h | 16 |
1 files changed, 8 insertions, 8 deletions
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; } |
