diff options
| author | Tim Foley <tim.foley.is@gmail.com> | 2017-08-12 16:14:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-12 16:14:48 -0700 |
| commit | bb66d6eddd649d8861cecefa2d6ccb7a28a827bc (patch) | |
| tree | 63fdd927ca39462176d506ea7bb99a5b8b8bfa87 /source/slang/decl-defs.h | |
| parent | 495f88167527945e680e091d49b5705f5f1af1f9 (diff) | |
| parent | f1bda6ada269716dd28653222a10d2c11dd052c5 (diff) | |
Merge pull request #158 from tfoleyNV/syntax-lookup
Data-driven parsing of modifiers
Diffstat (limited to 'source/slang/decl-defs.h')
| -rw-r--r-- | source/slang/decl-defs.h | 13 |
1 files changed, 3 insertions, 10 deletions
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() |