diff options
| author | Tim Foley <tfoley@nvidia.com> | 2017-08-14 14:48:37 -0700 |
|---|---|---|
| committer | Tim Foley <tfoley@nvidia.com> | 2017-08-14 14:48:37 -0700 |
| commit | 9885c972a6bfa6f856e505cdd90d9b71fdbdadaf (patch) | |
| tree | 7314b26e21ded966b6a4fe2430f0421c0c0970bd /source/slang/token.h | |
| parent | 7f57ea4ad86c2a3eb5a14fef458e711845c1f87e (diff) | |
Add an explicit `Name` type
Fixes #23
Up to this point, the compiler has used the ordinary `String` type to represent declaration names, which means a bunch of lookup structures throughout the compiler were string-to-whatever maps, which can reduce efficiency.
It also means that things like the `Token` type end up carying a `String` by value and paying for things like reference-counting.
This change adds a `Name` type that is used to represent names of variables, types, macros, etc.
Names are cached and unique'd globally for a session, and the string-to-name mapping gets done during lexing.
From that point on, most mapping is from pointers, which should make all the various table lookups faster.
More importantly (possibly), this brings us one step closer to being able to pool-allocate the AST nodes.
Diffstat (limited to 'source/slang/token.h')
| -rw-r--r-- | source/slang/token.h | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/source/slang/token.h b/source/slang/token.h index 306d4a2f2..5967ac49a 100644 --- a/source/slang/token.h +++ b/source/slang/token.h @@ -8,6 +8,8 @@ namespace Slang { +class Name; + enum class TokenType { #define TOKEN(NAME, DESC) NAME, @@ -21,18 +23,22 @@ enum TokenFlag : unsigned int AtStartOfLine = 1 << 0, AfterWhitespace = 1 << 1, SuppressMacroExpansion = 1 << 2, + ScrubbingNeeded = 1 << 3, }; typedef unsigned int TokenFlags; class Token { public: - TokenType type = TokenType::Unknown; - String Content; - SourceLoc Position; - TokenFlags flags = 0; + TokenType type = TokenType::Unknown; + TokenFlags flags = 0; + + SourceLoc loc; + void* ptrValue; + + String Content; - Token() = default; + Token() = default; Token( TokenType type, @@ -43,8 +49,15 @@ public: { type = type; Content = content; - Position = loc; + loc = loc; + ptrValue = nullptr; } + + Name* getName() const; + + Name* getNameOrNull() const; + + SourceLoc getLoc() const { return loc; } }; |
