From bc3dc0e82d52faa45ffe73448e86208f137b8536 Mon Sep 17 00:00:00 2001 From: Yong He Date: Fri, 8 Mar 2024 16:32:37 -0800 Subject: Parser and module finding logic fixes. (#3720) * Fix parsing logic of `struct` decl. Fixes #3716. * Allow `loadModule` to find modules with underscores. * Fix test. --- source/slang/slang-parser.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source/slang/slang-parser.cpp') diff --git a/source/slang/slang-parser.cpp b/source/slang/slang-parser.cpp index ae40234bc..3315c786a 100644 --- a/source/slang/slang-parser.cpp +++ b/source/slang/slang-parser.cpp @@ -2724,7 +2724,8 @@ namespace Slang { if(typeSpec.decl) { - if(peekToken(parser).flags & TokenFlag::AtStartOfLine) + if( peekToken(parser).type == TokenType::EndOfFile || + (peekToken(parser).flags & TokenFlag::AtStartOfLine)) { // The token after the `}` is at the start of its // own line, which means it can't be on the same line. @@ -4453,7 +4454,7 @@ namespace Slang parser->pendingModifiers = &modifiers; auto loc = parser->tokenReader.peekLoc(); - + auto ptoken = parser->tokenReader.peekToken(); switch (peekTokenType(parser)) { case TokenType::Identifier: -- cgit v1.2.3