diff options
| -rw-r--r-- | source/slang/check.cpp | 5 | ||||
| -rw-r--r-- | source/slang/compiler.h | 4 | ||||
| -rw-r--r-- | source/slang/decl-defs.h | 13 | ||||
| -rw-r--r-- | source/slang/emit.cpp | 1 | ||||
| -rw-r--r-- | source/slang/lower.cpp | 6 | ||||
| -rw-r--r-- | source/slang/modifier-defs.h | 36 | ||||
| -rw-r--r-- | source/slang/parser.cpp | 852 | ||||
| -rw-r--r-- | source/slang/slang-stdlib.cpp | 32 | ||||
| -rw-r--r-- | source/slang/slang.cpp | 14 | ||||
| -rw-r--r-- | source/slang/syntax.cpp | 12 | ||||
| -rw-r--r-- | source/slang/syntax.h | 3 |
11 files changed, 558 insertions, 420 deletions
diff --git a/source/slang/check.cpp b/source/slang/check.cpp index 9f7a13230..bb0b1b794 100644 --- a/source/slang/check.cpp +++ b/source/slang/check.cpp @@ -1202,11 +1202,6 @@ namespace Slang // These are only used in the stdlib, so no checking is needed } - void visitModifierDecl(ModifierDecl*) - { - // These are only used in the stdlib, so no checking is needed - } - void visitGenericTypeParamDecl(GenericTypeParamDecl*) { // These are only used in the stdlib, so no checking is needed for now diff --git a/source/slang/compiler.h b/source/slang/compiler.h index 4e779348d..a2d29f445 100644 --- a/source/slang/compiler.h +++ b/source/slang/compiler.h @@ -372,6 +372,10 @@ namespace Slang Type* getOverloadedType(); Type* getErrorType(); + SyntaxClass<RefObject> findSyntaxClass(String const& name); + + Dictionary<String, SyntaxClass<RefObject> > mapNameToSyntaxClass; + // Session(); diff --git a/source/slang/decl-defs.h b/source/slang/decl-defs.h index dc1647fd5..f30d4af82 100644 --- a/source/slang/decl-defs.h +++ b/source/slang/decl-defs.h @@ -212,14 +212,6 @@ END_SYNTAX_CLASS() SIMPLE_SYNTAX_CLASS(GenericValueParamDecl, VarDeclBase) -// Declaration of a user-defined modifier -SYNTAX_CLASS(ModifierDecl, Decl) - // The name of the C++ class to instantiate - // (this is a reference to a class in the compiler source code, - // and not the user's source code) - FIELD(Token, classNameToken) -END_SYNTAX_CLASS() - // An empty declaration (which might still have modifiers attached). // // An empty declaration is uncommon in HLSL, but @@ -236,8 +228,9 @@ SIMPLE_SYNTAX_CLASS(EmptyDecl, Decl) // SYNTAX_CLASS(SyntaxDecl, Decl) // What type of syntax node will be produced when parsing with this keyword? - FIELD(SyntaxClass<SyntaxNode>, syntaxClass) + FIELD(SyntaxClass<RefObject>, syntaxClass) // Callback to invoke in order to parse syntax with this keyword. - FIELD(SyntaxParseCallback, parserCallback) + FIELD(SyntaxParseCallback, parseCallback) + FIELD(void*, parseUserData) END_SYNTAX_CLASS() diff --git a/source/slang/emit.cpp b/source/slang/emit.cpp index 816e37391..5f6fca3c2 100644 --- a/source/slang/emit.cpp +++ b/source/slang/emit.cpp @@ -2746,7 +2746,6 @@ struct EmitVisitor void visit##NAME(NAME*, DeclEmitArg const&) {} // Only used by stdlib - IGNORED(ModifierDecl) IGNORED(SyntaxDecl) // Don't emit generic decls directly; we will only diff --git a/source/slang/lower.cpp b/source/slang/lower.cpp index 72b577259..0f4eca53f 100644 --- a/source/slang/lower.cpp +++ b/source/slang/lower.cpp @@ -2638,12 +2638,6 @@ struct LoweringVisitor return LoweredDecl(); } - LoweredDecl visitModifierDecl(ModifierDecl*) - { - // should not occur in user code - SLANG_UNEXPECTED("modifiers shouldn't occur in user code"); - } - LoweredDecl visitGenericValueParamDecl(GenericValueParamDecl*) { SLANG_UNEXPECTED("generics should be lowered to specialized decls"); diff --git a/source/slang/modifier-defs.h b/source/slang/modifier-defs.h index 5bab29aba..b007b3296 100644 --- a/source/slang/modifier-defs.h +++ b/source/slang/modifier-defs.h @@ -35,34 +35,34 @@ END_SYNTAX_CLASS() // directly. SYNTAX_CLASS(IntrinsicOpModifier, IntrinsicModifierBase) - // token that names the intrinsic op - FIELD(Token, opToken) +// token that names the intrinsic op +FIELD(Token, opToken) - // The opcode for the intrinsic operation - FIELD_INIT(IntrinsicOp, op, IntrinsicOp::Unknown) +// The opcode for the intrinsic operation +FIELD_INIT(IntrinsicOp, op, IntrinsicOp::Unknown) END_SYNTAX_CLASS() // A modifier that marks something as an intrinsic function, // for some subset of targets. SYNTAX_CLASS(TargetIntrinsicModifier, IntrinsicModifierBase) - // Token that names the target that the operation - // is an intrisic for. - FIELD(Token, targetToken) +// Token that names the target that the operation +// is an intrisic for. +FIELD(Token, targetToken) - // A custom definition for the operation - FIELD(Token, definitionToken) +// A custom definition for the operation +FIELD(Token, definitionToken) END_SYNTAX_CLASS() // A modifier to tag something as an intrinsic that requires // a certain GLSL extension to be enabled when used SYNTAX_CLASS(RequiredGLSLExtensionModifier, Modifier) - FIELD(Token, extensionNameToken) +FIELD(Token, extensionNameToken) END_SYNTAX_CLASS() // A modifier to tag something as an intrinsic that requires // a certain GLSL version to be enabled when used SYNTAX_CLASS(RequiredGLSLVersionModifier, Modifier) - FIELD(Token, versionNumberToken) +FIELD(Token, versionNumberToken) END_SYNTAX_CLASS() SIMPLE_SYNTAX_CLASS(InOutModifier, OutModifier) @@ -95,12 +95,18 @@ SIMPLE_SYNTAX_CLASS(SharedModifiers, Modifier) // different constructs. ABSTRACT_SYNTAX_CLASS(GLSLLayoutModifier, Modifier) - // The token used to introduce the modifier is stored - // as the `nameToken` field. +// The token used to introduce the modifier is stored +// as the `nameToken` field. + +// TODO: may want to accept a full expression here +FIELD(Token, valToken) +END_SYNTAX_CLASS() - // TODO: may want to accept a full expression here - FIELD(Token, valToken) +// AST nodes to represent the begin/end of a `layout` modifier group +ABSTRACT_SYNTAX_CLASS(GLSLLayoutModifierGroupMarker, Modifier) END_SYNTAX_CLASS() +SIMPLE_SYNTAX_CLASS(GLSLLayoutModifierGroupBegin, GLSLLayoutModifierGroupMarker) +SIMPLE_SYNTAX_CLASS(GLSLLayoutModifierGroupEnd, GLSLLayoutModifierGroupMarker) // We divide GLSL `layout` modifiers into those we have parsed // (in the sense of having some notion of their semantics), and diff --git a/source/slang/parser.cpp b/source/slang/parser.cpp index dd379df0e..d85363bb6 100644 --- a/source/slang/parser.cpp +++ b/source/slang/parser.cpp @@ -528,7 +528,7 @@ namespace Slang return ParseProgram(); } - RefPtr<SyntaxNode> ParseTypeDef(Parser* parser) + RefPtr<RefObject> ParseTypeDef(Parser* parser, void* /*userData*/) { RefPtr<TypeDefDecl> typeDefDecl = new TypeDefDecl(); @@ -602,274 +602,155 @@ namespace Slang } } - static Modifiers ParseModifiers(Parser* parser) + static TokenType peekTokenType(Parser* parser) { - Modifiers modifiers; - RefPtr<Modifier>* modifierLink = &modifiers.first; - for (;;) - { - SourceLoc loc = parser->tokenReader.PeekLoc(); - - if (0) {} - - #define CASE(KEYWORD, TYPE) \ - else if(AdvanceIf(parser, #KEYWORD)) do { \ - RefPtr<TYPE> modifier = new TYPE(); \ - modifier->Position = loc; \ - AddModifier(&modifierLink, modifier); \ - } while(0) - - CASE(in, InModifier); - CASE(input, InputModifier); - CASE(out, OutModifier); - CASE(inout, InOutModifier); - CASE(const, ConstModifier); - CASE(instance, InstanceModifier); - CASE(__builtin, BuiltinModifier); - - CASE(inline, InlineModifier); - CASE(public, PublicModifier); - CASE(require, RequireModifier); - CASE(param, ParamModifier); - CASE(extern, ExternModifier); - - CASE(row_major, HLSLRowMajorLayoutModifier); - CASE(column_major, HLSLColumnMajorLayoutModifier); - - CASE(nointerpolation, HLSLNoInterpolationModifier); - CASE(linear, HLSLLinearModifier); - CASE(sample, HLSLSampleModifier); - CASE(centroid, HLSLCentroidModifier); - CASE(precise, HLSLPreciseModifier); - CASE(shared, HLSLEffectSharedModifier); - CASE(groupshared, HLSLGroupSharedModifier); - CASE(static, HLSLStaticModifier); - CASE(uniform, HLSLUniformModifier); - CASE(volatile, HLSLVolatileModifier); - - // Modifiers for geometry shader input - CASE(point, HLSLPointModifier); - CASE(line, HLSLLineModifier); - CASE(triangle, HLSLTriangleModifier); - CASE(lineadj, HLSLLineAdjModifier); - CASE(triangleadj, HLSLTriangleAdjModifier); - - // Modifiers for unary operator declarations - CASE(__prefix, PrefixModifier); - CASE(__postfix, PostfixModifier); - - // Modifier to apply to `import` that should be re-exported - CASE(__exported, ExportedModifier); - - #undef CASE - - else if (AdvanceIf(parser, "__intrinsic_op")) - { - auto modifier = new IntrinsicOpModifier(); - modifier->Position = loc; - - parser->ReadToken(TokenType::LParent); - if (parser->LookAheadToken(TokenType::IntegerLiteral)) - { - modifier->op = (IntrinsicOp)StringToInt(parser->ReadToken().Content); - } - else - { - modifier->opToken = parser->ReadToken(TokenType::Identifier); - - modifier->op = findIntrinsicOp(modifier->opToken.Content.Buffer()); - - if (modifier->op == IntrinsicOp::Unknown) - { - parser->sink->diagnose(loc, Diagnostics::unimplemented, "unknown intrinsic op"); - } - } + return parser->tokenReader.PeekTokenType(); + } - parser->ReadToken(TokenType::RParent); + static Token advanceToken(Parser* parser) + { + return parser->ReadToken(); + } - AddModifier(&modifierLink, modifier); - } + static Token peekToken(Parser* parser) + { + return parser->tokenReader.PeekToken(); + } - else if (AdvanceIf(parser, "__intrinsic")) - { - auto modifier = new TargetIntrinsicModifier(); - modifier->Position = loc; + static SyntaxDecl* tryLookUpSyntaxDecl( + Parser* parser, + String const& name) + { + // Let's look up the name and see what we find. - if (AdvanceIf(parser, TokenType::LParent)) - { - modifier->targetToken = parser->ReadToken(TokenType::Identifier); + auto lookupResult = LookUp( + parser->getSession(), + nullptr, // no semantics visitor available yet + name, + parser->currentScope); - if( AdvanceIf(parser, TokenType::Comma) ) - { - if( parser->LookAheadToken(TokenType::StringLiteral) ) - { - modifier->definitionToken = parser->ReadToken(); - } - else - { - modifier->definitionToken = parser->ReadToken(TokenType::Identifier); - } - } + // If we didn't find anything, or the result was overloaded, + // then we aren't going to be able to extract a single decl. + if(!lookupResult.isValid() || lookupResult.isOverloaded()) + return nullptr; - parser->ReadToken(TokenType::RParent); - } + auto decl = lookupResult.item.declRef.getDecl(); + if( auto syntaxDecl = dynamic_cast<SyntaxDecl*>(decl) ) + { + return syntaxDecl; + } + else + { + return nullptr; + } + } - AddModifier(&modifierLink, modifier); - } + template<typename T> + bool tryParseUsingSyntaxDecl( + Parser* parser, + SyntaxDecl* syntaxDecl, + RefPtr<T>* outSyntax) + { + if (!syntaxDecl) + return false; - else if (AdvanceIf(parser, "__glsl_extension")) - { - auto modifier = new RequiredGLSLExtensionModifier(); - modifier->Position = loc; + if (!syntaxDecl->syntaxClass.isSubClassOf<T>()) + return false; - parser->ReadToken(TokenType::LParent); - modifier->extensionNameToken = parser->ReadToken(TokenType::Identifier); - parser->ReadToken(TokenType::RParent); + // Consume the token that specified the keyword + auto keywordToken = advanceToken(parser); - AddModifier(&modifierLink, modifier); - } + RefPtr<RefObject> parsedObject = syntaxDecl->parseCallback(parser, syntaxDecl->parseUserData); + auto syntax = parsedObject.As<T>(); - else if (AdvanceIf(parser, "__glsl_version")) + if (syntax) + { + if (!syntax->Position.isValid()) { - auto modifier = new RequiredGLSLVersionModifier(); - modifier->Position = loc; - - parser->ReadToken(TokenType::LParent); - modifier->versionNumberToken = parser->ReadToken(TokenType::IntegerLiteral); - parser->ReadToken(TokenType::RParent); - - AddModifier(&modifierLink, modifier); + syntax->Position = keywordToken.Position; } + } + else if (parsedObject) + { + // Something was parsed, but it didn't have the expected type! + SLANG_DIAGNOSE_UNEXPECTED(parser->sink, keywordToken, "parser callback did not return the expected type"); + } + *outSyntax = syntax; + return true; + } - else if (AdvanceIf(parser, "layout")) - { - parser->ReadToken(TokenType::LParent); - while (!AdvanceIfMatch(parser, TokenType::RParent)) - { - auto nameToken = parser->ReadToken(TokenType::Identifier); - - RefPtr<GLSLLayoutModifier> modifier; - - // TODO: better handling of this choise (e.g., lookup in scope) - if(0) {} - #define CASE(KEYWORD, CLASS) \ - else if(nameToken.Content == #KEYWORD) modifier = new CLASS() + template<typename T> + bool tryParseUsingSyntaxDecl( + Parser* parser, + RefPtr<T>* outSyntax) + { + if (peekTokenType(parser) != TokenType::Identifier) + return false; - CASE(constant_id, GLSLConstantIDLayoutModifier); - CASE(binding, GLSLBindingLayoutModifier); - CASE(set, GLSLSetLayoutModifier); - CASE(location, GLSLLocationLayoutModifier); - CASE(push_constant, GLSLPushConstantLayoutModifier); - CASE(local_size_x, GLSLLocalSizeXLayoutModifier); - CASE(local_size_y, GLSLLocalSizeYLayoutModifier); - CASE(local_size_z, GLSLLocalSizeZLayoutModifier); + auto nameToken = peekToken(parser); + auto name = nameToken.Content; - #undef CASE - else - { - modifier = new GLSLUnparsedLayoutModifier(); - } + auto syntaxDecl = tryLookUpSyntaxDecl(parser, name); - modifier->nameToken = nameToken; + if (!syntaxDecl) + return false; - if(AdvanceIf(parser, TokenType::OpAssign)) - { - modifier->valToken = parser->ReadToken(TokenType::IntegerLiteral); - } + return tryParseUsingSyntaxDecl(parser, syntaxDecl, outSyntax); + } - AddModifier(&modifierLink, modifier); + static Modifiers ParseModifiers(Parser* parser) + { + Modifiers modifiers; + RefPtr<Modifier>* modifierLink = &modifiers.first; + for (;;) + { + SourceLoc loc = parser->tokenReader.PeekLoc(); - if (AdvanceIf(parser, TokenType::RParent)) - break; - parser->ReadToken(TokenType::Comma); - } - } - else if (parser->tokenReader.PeekTokenType() == TokenType::LBracket) + switch (peekTokenType(parser)) { - ParseSquareBracketAttributes(parser, &modifierLink); - } - else if (AdvanceIf(parser,"__builtin_type")) - { - RefPtr<BuiltinTypeModifier> modifier = new BuiltinTypeModifier(); - parser->ReadToken(TokenType::LParent); - modifier->tag = BaseType(StringToInt(parser->ReadToken(TokenType::IntegerLiteral).Content)); - parser->ReadToken(TokenType::RParent); + default: + // If we don't see a token type that we recognize, then + // assume we are done with the modifier sequence. + return modifiers; - AddModifier(&modifierLink, modifier); - } - else if (AdvanceIf(parser,"__magic_type")) - { - RefPtr<MagicTypeModifier> modifier = new MagicTypeModifier(); - parser->ReadToken(TokenType::LParent); - modifier->name = parser->ReadToken(TokenType::Identifier).Content; - if (AdvanceIf(parser, TokenType::Comma)) + case TokenType::Identifier: { - modifier->tag = uint32_t(StringToInt(parser->ReadToken(TokenType::IntegerLiteral).Content)); - } - parser->ReadToken(TokenType::RParent); + // We see an identifier ahead, and it might be the name + // of a modifier keyword of some kind. - AddModifier(&modifierLink, modifier); - } - else - { - // Fallback case if none of the above explicit cases matched. + Token nameToken = peekToken(parser); - // If we are looking at an identifier, then it may map to a - // modifier declaration visible in the current scope - if( parser->LookAheadToken(TokenType::Identifier) ) - { - LookupResult lookupResult = LookUp( - parser->getSession(), - nullptr, // No semantics visitor available yet! - parser->tokenReader.PeekToken().Content, - parser->currentScope); - - if( lookupResult.isValid() && !lookupResult.isOverloaded() ) + RefPtr<Modifier> parsedModifier; + if (tryParseUsingSyntaxDecl<Modifier>(parser, &parsedModifier)) { - auto& item = lookupResult.item; - auto decl = item.declRef.getDecl(); - - if( auto modifierDecl = dynamic_cast<ModifierDecl*>(decl) ) + parsedModifier->nameToken = nameToken; + if (!parsedModifier->Position.isValid()) { - // We found a declaration for some modifier syntax, - // so lets create an instance of the type it names - // here. - - auto syntax = createInstanceOfSyntaxClassByName(modifierDecl->classNameToken.Content); - auto modifier = dynamic_cast<Modifier*>(syntax); - - if( modifier ) - { - modifier->Position = parser->tokenReader.PeekLoc(); - modifier->nameToken = parser->ReadToken(TokenType::Identifier); - - AddModifier(&modifierLink, modifier); - continue; - } - else - { - SLANG_DIAGNOSE_UNEXPECTED(parser->sink, parser->tokenReader.PeekLoc(), "needed a modifier"); - - parser->ReadToken(TokenType::Identifier); - } + parsedModifier->Position = nameToken.Position; } + + AddModifier(&modifierLink, parsedModifier); + continue; } + + // If there was no match for a modifier keyword, then we + // must be at the end of the modifier sequence + return modifiers; } + break; - // Done with modifier list - return modifiers; + // HLSL uses `[attributeName]` style for its modifiers, which closely + // matches the C++ `[[attributeName]]` style. + case TokenType::LBracket: + ParseSquareBracketAttributes(parser, &modifierLink); + break; } } } - static TokenType peekTokenType(Parser* parser) - { - return parser->tokenReader.PeekTokenType(); - } - - static RefPtr<SyntaxNode> parseImportDecl( - Parser* parser) + static RefPtr<RefObject> parseImportDecl( + Parser* parser, void* /*userData*/) { parser->haveSeenAnyImportDecls = true; @@ -1854,14 +1735,14 @@ namespace Slang return bufferVarDecl; } - static RefPtr<SyntaxNode> parseHLSLCBufferDecl( - Parser* parser) + static RefPtr<RefObject> parseHLSLCBufferDecl( + Parser* parser, void* /*userData*/) { return ParseHLSLBufferDecl(parser, "ConstantBuffer"); } - static RefPtr<SyntaxNode> parseHLSLTBufferDecl( - Parser* parser) + static RefPtr<RefObject> parseHLSLTBufferDecl( + Parser* parser, void* /*userData*/) { return ParseHLSLBufferDecl(parser, "TextureBuffer"); } @@ -2091,8 +1972,8 @@ namespace Slang } } - static RefPtr<SyntaxNode> ParseGenericDecl( - Parser* parser) + static RefPtr<RefObject> ParseGenericDecl( + Parser* parser, void* /*userData*/) { RefPtr<GenericDecl> decl = new GenericDecl(); parser->FillPosition(decl.Ptr()); @@ -2126,7 +2007,7 @@ namespace Slang return decl; } - static RefPtr<SyntaxNode> ParseExtensionDecl(Parser* parser) + static RefPtr<RefObject> ParseExtensionDecl(Parser* parser, void* /*userData*/) { RefPtr<ExtensionDecl> decl = new ExtensionDecl(); parser->FillPosition(decl.Ptr()); @@ -2155,7 +2036,7 @@ namespace Slang } } - static RefPtr<SyntaxNode> parseInterfaceDecl(Parser* parser) + static RefPtr<RefObject> parseInterfaceDecl(Parser* parser, void* /*userData*/) { RefPtr<InterfaceDecl> decl = new InterfaceDecl(); parser->FillPosition(decl.Ptr()); @@ -2168,7 +2049,7 @@ namespace Slang return decl; } - static RefPtr<SyntaxNode> ParseConstructorDecl(Parser* parser) + static RefPtr<RefObject> ParseConstructorDecl(Parser* parser, void* /*userData*/) { RefPtr<ConstructorDecl> decl = new ConstructorDecl(); parser->FillPosition(decl.Ptr()); @@ -2215,7 +2096,7 @@ namespace Slang return decl; } - static RefPtr<SyntaxNode> ParseSubscriptDecl(Parser* parser) + static RefPtr<RefObject> ParseSubscriptDecl(Parser* parser, void* /*userData*/) { RefPtr<SubscriptDecl> decl = new SubscriptDecl(); parser->FillPosition(decl.Ptr()); @@ -2249,20 +2130,106 @@ namespace Slang return decl; } - // Parse a declaration of a new modifier keyword - static RefPtr<SyntaxNode> parseModifierDecl(Parser* parser) + static Token expect(Parser* parser, TokenType tokenType) { - RefPtr<ModifierDecl> decl = new ModifierDecl(); + return parser->ReadToken(tokenType); + } - parser->ReadToken(TokenType::LParent); - decl->classNameToken = parser->ReadToken(TokenType::Identifier); - parser->ReadToken(TokenType::RParent); + static Token expectIdentifier(Parser* parser) + { + return parser->ReadToken(TokenType::Identifier); + } - parser->FillPosition(decl.Ptr()); - decl->Name = parser->ReadToken(TokenType::Identifier); + // This is a catch-all syntax-construction callback to handle cases where + // a piece of syntax is fully defined by the keyword to use, along with + // the class of AST node to construct. + static RefPtr<RefObject> parseSimpleSyntax(Parser* parser, void* userData) + { + SyntaxClassBase syntaxClass((SyntaxClassBase::ClassInfo*) userData); + return (RefObject*) syntaxClass.createInstanceImpl(); + } - parser->ReadToken(TokenType::Semicolon); - return decl; + // Parse a declaration of a keyword that can be used to define further syntax. + static RefPtr<RefObject> parseSyntaxDecl(Parser* parser, void* /*userData*/) + { + // Right now the basic form is: + // + // syntax <name:id> [: <syntaxClass:id>] [= <existingKeyword:id>]; + // + // - `name` gives the name of the keyword to define. + // - `syntaxClass` is the name of an AST node class that we expect + // this syntax to construct when parsed. + // - `existingKeyword` is the name of an existing keyword that + // the new syntax should be an alias for. + + // First we parse the keyword name. + auto nameToken = expectIdentifier(parser); + + // Next we look for a clause that specified the AST node class. + SyntaxClass<RefObject> syntaxClass; + if (AdvanceIf(parser, TokenType::Colon)) + { + // User is specifying the class that should be construted + auto classNameToken = expectIdentifier(parser); + + syntaxClass = parser->getSession()->findSyntaxClass(classNameToken.Content); + } + + // If the user specified a syntax class, then we will default + // to the `parseSimpleSyntax` callback that will just construct + // an instance of that type to represent the keyword in the AST. + SyntaxParseCallback parseCallback = &parseSimpleSyntax; + void* parseUserData = (void*) syntaxClass.classInfo; + + // Next we look for an initializer that will make this keyword + // an alias for some existing keyword. + if (AdvanceIf(parser, TokenType::OpAssign)) + { + auto existingKeywordToken = expectIdentifier(parser); + + auto existingSyntax = tryLookUpSyntaxDecl(parser, existingKeywordToken.Content); + if (!existingSyntax) + { + // TODO: diagnose: keyword did not name syntax + } + else + { + // The user is expecting us to parse our new syntax like + // the existing syntax given, so we need to override + // the callback. + parseCallback = existingSyntax->parseCallback; + parseUserData = existingSyntax->parseUserData; + + // If we don't already have a syntax class specified, then + // we will crib the one from the existing syntax, to ensure + // that we are creating a drop-in alias. + if (!syntaxClass.classInfo) + syntaxClass = existingSyntax->syntaxClass; + } + } + + // It is an error if the user didn't give us either an existing keyword + // to use to the define the callback, or a valid AST node class to construct. + // + // TODO: down the line this should be expanded so that the user can reference + // an existing *function* to use to parse the chosen syntax. + if (!syntaxClass.classInfo) + { + // TODO: diagnose: either a type or an existing keyword needs to be specified + } + + expect(parser, TokenType::Semicolon); + + // TODO: skip creating the declaration if anything failed, just to not screw things + // up for downstream code? + + RefPtr<SyntaxDecl> syntaxDecl = new SyntaxDecl(); + syntaxDecl->Name = nameToken; + syntaxDecl->Position = nameToken.Position; + syntaxDecl->syntaxClass = syntaxClass; + syntaxDecl->parseCallback = parseCallback; + syntaxDecl->parseUserData = parseUserData; + return syntaxDecl; } // Finish up work on a declaration that was parsed @@ -2283,44 +2250,6 @@ namespace Slang } } - static Token advanceToken(Parser* parser) - { - return parser->ReadToken(); - } - - static Token peekToken(Parser* parser) - { - return parser->tokenReader.PeekToken(); - } - - static SyntaxDecl* tryLookUpSyntaxDecl( - Parser* parser, - String const& name) - { - // Let's look up the name and see what we find. - - auto lookupResult = LookUp( - parser->getSession(), - nullptr, // no semantics visitor available yet - name, - parser->currentScope); - - // If we didn't find anything, or the result was overloaded, - // then we aren't going to be able to extract a single decl. - if(!lookupResult.isValid() || lookupResult.isOverloaded()) - return nullptr; - - auto decl = lookupResult.item.declRef.getDecl(); - if( auto syntaxDecl = dynamic_cast<SyntaxDecl*>(decl) ) - { - return syntaxDecl; - } - else - { - return nullptr; - } - } - static RefPtr<DeclBase> ParseDeclWithModifiers( Parser* parser, ContainerDecl* containerDecl, @@ -2358,49 +2287,20 @@ namespace Slang } } - // We will look up the name that was given, and try to see - // if it names a syntactic keyword that will tell us how to parse - // things. - auto nameToken = peekToken(parser); - auto name = nameToken.Content; - auto syntaxDecl = tryLookUpSyntaxDecl(parser, name); - - // TODO: confirm that the syntax is for a declaration? - if (syntaxDecl && syntaxDecl->syntaxClass.isSubClassOf<Decl>()) - { - // Consume the keyword token, so that the callback doesn't - // need to deal with it. - advanceToken(parser); - - auto parsedSyntax = syntaxDecl->parserCallback(parser); - if (parsedSyntax) - { - if (!parsedSyntax->Position.isValid()) - { - parsedSyntax->Position = nameToken.Position; - } - - auto parsedDecl = parsedSyntax->As<Decl>(); - if (parsedDecl) - { - decl = parsedDecl; - } - else - { - // TODO: diagnose! - } - } - - } - else + // Next we will check whether we can use the identifier token + // as a declaration keyword and parse a declaration using + // its associated callback: + RefPtr<Decl> parsedDecl; + if (tryParseUsingSyntaxDecl<Decl>(parser, &parsedDecl)) { - // If the idenfier given doesn't name a declaration keyword, - // then we will try to parse things as a declarator decl. - - decl = ParseDeclaratorDecl(parser, containerDecl); + decl = parsedDecl; break; } + // Our final fallback case is to assume that the user is + // probably writing a C-style declarator-based declaration. + decl = ParseDeclaratorDecl(parser, containerDecl); + break; } break; @@ -3776,14 +3676,16 @@ namespace Slang Scope* scope, char const* nameText, SyntaxParseCallback callback, - SyntaxClass<SyntaxNode> syntaxClass) + void* userData, + SyntaxClass<RefObject> syntaxClass) { String name(nameText); RefPtr<SyntaxDecl> syntaxDecl = new SyntaxDecl(); syntaxDecl->Name.Content = name; syntaxDecl->syntaxClass = syntaxClass; - syntaxDecl->parserCallback = callback; + syntaxDecl->parseCallback = callback; + syntaxDecl->parseUserData = userData; AddMember(scope, syntaxDecl); } @@ -3793,11 +3695,177 @@ namespace Slang Session* session, Scope* scope, char const* name, - SyntaxParseCallback callback) + SyntaxParseCallback callback, + void* userData = nullptr) + { + addBuiltinSyntaxImpl(session, scope, name, callback, userData, getClass<T>()); + } + + template<typename T> + static void addSimpleModifierSyntax( + Session* session, + Scope* scope, + char const* name) + { + auto syntaxClass = getClass<T>(); + addBuiltinSyntaxImpl(session, scope, name, &parseSimpleSyntax, (void*) syntaxClass.classInfo, getClass<T>()); + } + + static RefPtr<RefObject> parseIntrinsicOpModifier(Parser* parser, void* /*userData*/) + { + RefPtr<IntrinsicOpModifier> modifier = new IntrinsicOpModifier(); + + parser->ReadToken(TokenType::LParent); + if (parser->LookAheadToken(TokenType::IntegerLiteral)) + { + modifier->op = (IntrinsicOp)StringToInt(parser->ReadToken().Content); + } + else + { + modifier->opToken = parser->ReadToken(TokenType::Identifier); + + modifier->op = findIntrinsicOp(modifier->opToken.Content.Buffer()); + + if (modifier->op == IntrinsicOp::Unknown) + { + parser->sink->diagnose(modifier->opToken, Diagnostics::unimplemented, "unknown intrinsic op"); + } + } + + parser->ReadToken(TokenType::RParent); + + return modifier; + } + + static RefPtr<RefObject> parseIntrinsicModifier(Parser* parser, void* /*userData*/) + { + auto modifier = new TargetIntrinsicModifier(); + + if (AdvanceIf(parser, TokenType::LParent)) + { + modifier->targetToken = parser->ReadToken(TokenType::Identifier); + + if( AdvanceIf(parser, TokenType::Comma) ) + { + if( parser->LookAheadToken(TokenType::StringLiteral) ) + { + modifier->definitionToken = parser->ReadToken(); + } + else + { + modifier->definitionToken = parser->ReadToken(TokenType::Identifier); + } + } + + parser->ReadToken(TokenType::RParent); + } + + return modifier; + } + + static RefPtr<RefObject> parseGLSLExtensionModifier(Parser* parser, void* /*userData*/) { - addBuiltinSyntaxImpl(session, scope, name, callback, getClass<T>()); + auto modifier = new RequiredGLSLExtensionModifier(); + + parser->ReadToken(TokenType::LParent); + modifier->extensionNameToken = parser->ReadToken(TokenType::Identifier); + parser->ReadToken(TokenType::RParent); + + return modifier; + } + + static RefPtr<RefObject> parseGLSLVersionModifier(Parser* parser, void* /*userData*/) + { + auto modifier = new RequiredGLSLVersionModifier(); + + parser->ReadToken(TokenType::LParent); + modifier->versionNumberToken = parser->ReadToken(TokenType::IntegerLiteral); + parser->ReadToken(TokenType::RParent); + + return modifier; } + static RefPtr<RefObject> parseLayoutModifier(Parser* parser, void* /*userData*/) + { + Modifiers modifiers; + RefPtr<Modifier>* modifierLink = &modifiers.first; + + auto beginMarker = new GLSLLayoutModifierGroupBegin(); + AddModifier(&modifierLink, beginMarker); + + parser->ReadToken(TokenType::LParent); + while (!AdvanceIfMatch(parser, TokenType::RParent)) + { + auto nameToken = parser->ReadToken(TokenType::Identifier); + + RefPtr<GLSLLayoutModifier> modifier; + + // TODO: better handling of this choise (e.g., lookup in scope) + if(0) {} + #define CASE(KEYWORD, CLASS) \ + else if(nameToken.Content == #KEYWORD) modifier = new CLASS() + + CASE(constant_id, GLSLConstantIDLayoutModifier); + CASE(binding, GLSLBindingLayoutModifier); + CASE(set, GLSLSetLayoutModifier); + CASE(location, GLSLLocationLayoutModifier); + CASE(push_constant, GLSLPushConstantLayoutModifier); + CASE(local_size_x, GLSLLocalSizeXLayoutModifier); + CASE(local_size_y, GLSLLocalSizeYLayoutModifier); + CASE(local_size_z, GLSLLocalSizeZLayoutModifier); + + #undef CASE + else + { + modifier = new GLSLUnparsedLayoutModifier(); + } + + modifier->nameToken = nameToken; + + if(AdvanceIf(parser, TokenType::OpAssign)) + { + modifier->valToken = parser->ReadToken(TokenType::IntegerLiteral); + } + + AddModifier(&modifierLink, modifier); + + if (AdvanceIf(parser, TokenType::RParent)) + break; + parser->ReadToken(TokenType::Comma); + } + + auto endMarker = new GLSLLayoutModifierGroupEnd(); + AddModifier(&modifierLink, endMarker); + + return modifiers.first; + } + + static RefPtr<RefObject> parseBuiltinTypeModifier(Parser* parser, void* /*userData*/) + { + RefPtr<BuiltinTypeModifier> modifier = new BuiltinTypeModifier(); + parser->ReadToken(TokenType::LParent); + modifier->tag = BaseType(StringToInt(parser->ReadToken(TokenType::IntegerLiteral).Content)); + parser->ReadToken(TokenType::RParent); + + return modifier; + } + + static RefPtr<RefObject> parseMagicTypeModifier(Parser* parser, void* /*userData*/) + { + RefPtr<MagicTypeModifier> modifier = new MagicTypeModifier(); + parser->ReadToken(TokenType::LParent); + modifier->name = parser->ReadToken(TokenType::Identifier).Content; + if (AdvanceIf(parser, TokenType::Comma)) + { + modifier->tag = uint32_t(StringToInt(parser->ReadToken(TokenType::IntegerLiteral).Content)); + } + parser->ReadToken(TokenType::RParent); + + return modifier; + } + + + RefPtr<ModuleDecl> populateBaseLanguageModule( Session* session, RefPtr<Scope> scope) @@ -3805,39 +3873,91 @@ namespace Slang RefPtr<ModuleDecl> moduleDecl = new ModuleDecl(); scope->containerDecl = moduleDecl; - addBuiltinSyntax<Decl>(session, scope, "typedef", &ParseTypeDef); - addBuiltinSyntax<Decl>(session, scope, "cbuffer", &parseHLSLCBufferDecl); - addBuiltinSyntax<Decl>(session, scope, "tbuffer", &parseHLSLTBufferDecl); - addBuiltinSyntax<Decl>(session, scope, "__generic", &ParseGenericDecl); - addBuiltinSyntax<Decl>(session, scope, "__extension", &ParseExtensionDecl); - addBuiltinSyntax<Decl>(session, scope, "__init", &ParseConstructorDecl); - addBuiltinSyntax<Decl>(session, scope, "__subscript", &ParseSubscriptDecl); - addBuiltinSyntax<Decl>(session, scope, "interface", &parseInterfaceDecl); - addBuiltinSyntax<Decl>(session, scope, "__modifier", &parseModifierDecl); - addBuiltinSyntax<Decl>(session, scope, "__import", &parseImportDecl); - -#if 0 - // TODO: actual dispatch! - if (parser->LookAheadToken("struct")) - decl = ParseDeclaratorDecl(parser, containerDecl); - else if (parser->LookAheadToken("class")) - decl = ParseDeclaratorDecl(parser, containerDecl); - else if (parser->LookAheadToken("__generic")) - decl = ParseGenericDecl(parser); - else if (parser->LookAheadToken("__extension")) - decl = ParseExtensionDecl(parser); - else if (parser->LookAheadToken("__init")) - decl = ParseConstructorDecl(parser); - else if (parser->LookAheadToken("__subscript")) - decl = ParseSubscriptDecl(parser); - else if (parser->LookAheadToken("interface")) - decl = parseInterfaceDecl(parser); - else if(parser->LookAheadToken("__modifier")) - decl = parseModifierDecl(parser); - else if(parser->LookAheadToken("__import")) - decl = parseImportDecl(parser); -#endif - + // Add syntax for declaration keywords + #define DECL(KEYWORD, CALLBACK) \ + addBuiltinSyntax<Decl>(session, scope, #KEYWORD, &CALLBACK) + + DECL(typedef, ParseTypeDef); + DECL(cbuffer, parseHLSLCBufferDecl); + DECL(tbuffer, parseHLSLTBufferDecl); + DECL(__generic, ParseGenericDecl); + DECL(__extension, ParseExtensionDecl); + DECL(__init, ParseConstructorDecl); + DECL(__subscript, ParseSubscriptDecl); + DECL(interface, parseInterfaceDecl); + DECL(syntax, parseSyntaxDecl); + DECL(__import, parseImportDecl); + + #undef DECL + + // Add syntax for "simple" modifier keywords. + // These are the ones that just appear as a single + // keyword (no further tokens expected/allowed), + // and which can be represented just by creating + // a new AST node of the corresponding type. + #define MODIFIER(KEYWORD, CLASS) \ + addSimpleModifierSyntax<CLASS>(session, scope, #KEYWORD) + + MODIFIER(in, InModifier); + MODIFIER(input, InputModifier); + MODIFIER(out, OutModifier); + MODIFIER(inout, InOutModifier); + MODIFIER(const, ConstModifier); + MODIFIER(instance, InstanceModifier); + MODIFIER(__builtin, BuiltinModifier); + + MODIFIER(inline, InlineModifier); + MODIFIER(public, PublicModifier); + MODIFIER(require, RequireModifier); + MODIFIER(param, ParamModifier); + MODIFIER(extern, ExternModifier); + + MODIFIER(row_major, HLSLRowMajorLayoutModifier); + MODIFIER(column_major, HLSLColumnMajorLayoutModifier); + + MODIFIER(nointerpolation, HLSLNoInterpolationModifier); + MODIFIER(linear, HLSLLinearModifier); + MODIFIER(sample, HLSLSampleModifier); + MODIFIER(centroid, HLSLCentroidModifier); + MODIFIER(precise, HLSLPreciseModifier); + MODIFIER(shared, HLSLEffectSharedModifier); + MODIFIER(groupshared, HLSLGroupSharedModifier); + MODIFIER(static, HLSLStaticModifier); + MODIFIER(uniform, HLSLUniformModifier); + MODIFIER(volatile, HLSLVolatileModifier); + + // Modifiers for geometry shader input + MODIFIER(point, HLSLPointModifier); + MODIFIER(line, HLSLLineModifier); + MODIFIER(triangle, HLSLTriangleModifier); + MODIFIER(lineadj, HLSLLineAdjModifier); + MODIFIER(triangleadj, HLSLTriangleAdjModifier); + + // Modifiers for unary operator declarations + MODIFIER(__prefix, PrefixModifier); + MODIFIER(__postfix, PostfixModifier); + + // Modifier to apply to `import` that should be re-exported + MODIFIER(__exported, ExportedModifier); + + #undef MODIFIER + + // Add syntax for more complex modifiers, which allow + // or expect more tokens after the initial keyword. + #define MODIFIER(KEYWORD, CALLBACK) \ + addBuiltinSyntax<Modifier>(session, scope, #KEYWORD, &CALLBACK) + + MODIFIER(layout, parseLayoutModifier); + + MODIFIER(__intrinsic_op, parseIntrinsicOpModifier); + MODIFIER(__intrinsic, parseIntrinsicModifier); + MODIFIER(__glsl_extension, parseGLSLExtensionModifier); + MODIFIER(__glsl_version, parseGLSLVersionModifier); + + MODIFIER(__builtin_type, parseBuiltinTypeModifier); + MODIFIER(__magic_type, parseMagicTypeModifier); + +#undef MODIFIER return moduleDecl; } diff --git a/source/slang/slang-stdlib.cpp b/source/slang/slang-stdlib.cpp index 71e8a6621..3ec8b9db4 100644 --- a/source/slang/slang-stdlib.cpp +++ b/source/slang/slang-stdlib.cpp @@ -2232,19 +2232,19 @@ namespace Slang // Define additional keywords - sb << "__modifier(GLSLBufferModifier) buffer;\n"; + sb << "syntax buffer : GLSLBufferModifier;\n"; // [GLSL 4.3] Storage Qualifiers // TODO: need to support `shared` here with its GLSL meaning - sb << "__modifier(GLSLPatchModifier) patch;\n"; + sb << "syntax patch : GLSLPatchModifier;\n"; // `centroid` and `sample` handled centrally // [GLSL 4.5] Interpolation Qualifiers - sb << "__modifier(SimpleModifier) smooth;\n"; - sb << "__modifier(SimpleModifier) flat;\n"; - sb << "__modifier(SimpleModifier) noperspective;\n"; + sb << "syntax smooth : SimpleModifier;\n"; + sb << "syntax flat : SimpleModifier;\n"; + sb << "syntax noperspectie : SimpleModifier;\n"; // [GLSL 4.3.2] Constant Qualifier @@ -2253,24 +2253,24 @@ namespace Slang // since they mean such different things. // [GLSL 4.7.2] Precision Qualifiers - sb << "__modifier(SimpleModifier) highp;\n"; - sb << "__modifier(SimpleModifier) mediump;\n"; - sb << "__modifier(SimpleModifier) lowp;\n"; + sb << "syntax highp : SimpleModifier;\n"; + sb << "syntax mediump : SimpleModifier;\n"; + sb << "syntax lowp : SimpleModifier;\n"; // [GLSL 4.8.1] The Invariant Qualifier - sb << "__modifier(GLSLWriteOnlyModifier) invariant;\n"; + sb << "syntax invariant : SimpleModifier;\n"; // [GLSL 4.10] Memory Qualifiers - sb << "__modifier(SimpleModifier) coherent;\n"; - sb << "__modifier(SimpleModifier) volatile;\n"; - sb << "__modifier(SimpleModifier) restrict;\n"; - sb << "__modifier(GLSLReadOnlyModifier) readonly;\n"; - sb << "__modifier(GLSLWriteOnlyModifier) writeonly;\n"; + sb << "syntax coherent : SimpleModifier;\n"; + sb << "syntax volatile : SimpleModifier;\n"; + sb << "syntax restrict : SimpleModifier;\n"; + sb << "syntax readonly : GLSLReadOnlyModifier;\n"; + sb << "syntax writeonly : GLSLWriteOnlyModifier;\n"; - // We will treat `subroutine` as a qualifier - sb << "__modifier(SimpleModifier) subroutine;\n"; + // We will treat `subroutine` as a qualifier for now + sb << "syntax subroutine : SimpleModifier;\n"; glslLibraryCode = sb.ProduceString(); return glslLibraryCode; diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp index 11d9e6e86..2bacb28ca 100644 --- a/source/slang/slang.cpp +++ b/source/slang/slang.cpp @@ -20,6 +20,20 @@ namespace Slang { Session::Session() { + // Initialize the lookup table of syntax classes: + + #define SYNTAX_CLASS(NAME, BASE) mapNameToSyntaxClass.Add(#NAME, getClass<NAME>()); + +#include "object-meta-begin.h" +#include "syntax-base-defs.h" +#include "expr-defs.h" +#include "decl-defs.h" +#include "modifier-defs.h" +#include "stmt-defs.h" +#include "type-defs.h" +#include "val-defs.h" +#include "object-meta-end.h" + // Make sure our source manager is initialized builtinSourceManager.initialize(nullptr); diff --git a/source/slang/syntax.cpp b/source/slang/syntax.cpp index 0135e2316..2bd6c122c 100644 --- a/source/slang/syntax.cpp +++ b/source/slang/syntax.cpp @@ -90,6 +90,8 @@ ABSTRACT_SYNTAX_CLASS(Type, Val); ABSTRACT_SYNTAX_CLASS(Modifier, SyntaxNodeBase); ABSTRACT_SYNTAX_CLASS(Expr, SyntaxNode); +ABSTRACT_SYNTAX_CLASS(Substitutions, SyntaxNode); + #include "object-meta-end.h" bool SyntaxClassBase::isSubClassOfImpl(SyntaxClassBase const& super) const @@ -258,6 +260,16 @@ void Type::accept(IValVisitor* visitor, void* extra) return errorType; } + SyntaxClass<RefObject> Session::findSyntaxClass(String const& name) + { + SyntaxClass<RefObject> syntaxClass; + if (mapNameToSyntaxClass.TryGetValue(name, syntaxClass)) + return syntaxClass; + + return SyntaxClass<RefObject>(); + } + + bool ArrayExpressionType::EqualsImpl(Type * type) { diff --git a/source/slang/syntax.h b/source/slang/syntax.h index 250c4b3cc..6f3c32d18 100644 --- a/source/slang/syntax.h +++ b/source/slang/syntax.h @@ -26,7 +26,8 @@ namespace Slang class Parser; class SyntaxNode; - typedef RefPtr<SyntaxNode> (*SyntaxParseCallback)(Parser* parser); + + typedef RefPtr<RefObject> (*SyntaxParseCallback)(Parser* parser, void* userData); // Forward-declare all syntax classes #define SYNTAX_CLASS(NAME, BASE, ...) class NAME; |