summaryrefslogtreecommitdiff
path: root/source/slang/token.h
diff options
context:
space:
mode:
authorTim Foley <tim.foley.is@gmail.com>2017-08-09 11:20:09 -0700
committerGitHub <noreply@github.com>2017-08-09 11:20:09 -0700
commit6e4830f4d74adef0a47c6503d84dc114240fafa3 (patch)
tree4f549da8c05be186f12442565389d9f3df44c6d7 /source/slang/token.h
parent8e4c0c35d6c2d0fd754b713441c2eee8f13f87b2 (diff)
parent695c2700de54a5fec72ce7214c137a1dc3a02d7b (diff)
Merge pull request #155 from tfoleyNV/renaming
Major naming overhaul:
Diffstat (limited to 'source/slang/token.h')
-rw-r--r--source/slang/token.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/slang/token.h b/source/slang/token.h
index f177eb512..f29f2b4c6 100644
--- a/source/slang/token.h
+++ b/source/slang/token.h
@@ -26,7 +26,7 @@ typedef unsigned int TokenFlags;
class Token
{
public:
- TokenType Type = TokenType::Unknown;
+ TokenType type = TokenType::Unknown;
String Content;
CodePosition Position;
TokenFlags flags = 0;
@@ -34,7 +34,7 @@ public:
Token(TokenType type, const String & content, int line, int col, int pos, String fileName, TokenFlags flags = 0)
: flags(flags)
{
- Type = type;
+ type = type;
Content = content;
Position = CodePosition(line, col, pos, fileName);
}