summaryrefslogtreecommitdiffstats
path: root/source/slang/parser.cpp
diff options
context:
space:
mode:
authorTim Foley <tfoley@nvidia.com>2017-06-26 09:32:40 -0700
committerTim Foley <tfoley@nvidia.com>2017-06-26 12:06:54 -0700
commit7d3bfe403362b294cc2a1f2607d51dfcd447aafd (patch)
tree4dac8dcdb29a0d8e74f78f12c0bbe63e669b2b0c /source/slang/parser.cpp
parent3f316dcbd9274efc74f817cf36f17a511ff2e21e (diff)
Replace "auto-import" with `#import`
Right now `#import` only differs from `#include` in that it takes a string literal for a file name instead of a raw identifier (to which `.slang` gets appended). The next step is to make `#import` respect preprocessor state, while `__import` doesn't.
Diffstat (limited to 'source/slang/parser.cpp')
-rw-r--r--source/slang/parser.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/slang/parser.cpp b/source/slang/parser.cpp
index 0598e67a7..61d7b225d 100644
--- a/source/slang/parser.cpp
+++ b/source/slang/parser.cpp
@@ -805,10 +805,10 @@ namespace Slang
return decl;
}
- static RefPtr<Decl> parseAutoImportDecl(
+ static RefPtr<Decl> parsePoundImportDecl(
Parser* parser)
{
- Token importToken = parser->ReadToken(TokenType::AutoImport);
+ Token importToken = parser->ReadToken(TokenType::PoundImport);
auto decl = new ImportDecl();
decl->nameToken = importToken;
@@ -2186,8 +2186,8 @@ namespace Slang
decl = parseModifierDecl(parser);
else if(parser->LookAheadToken("__import"))
decl = parseImportDecl(parser);
- else if(parser->LookAheadToken(TokenType::AutoImport))
- decl = parseAutoImportDecl(parser);
+ else if(parser->LookAheadToken(TokenType::PoundImport))
+ decl = parsePoundImportDecl(parser);
else if (AdvanceIf(parser, TokenType::Semicolon))
{
decl = new EmptyDecl();