diff options
| author | Yong He <yonghe@outlook.com> | 2018-01-15 13:54:32 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-15 13:54:32 -0800 |
| commit | cff418ba55e60a45554a8fb77dea756b8724396f (patch) | |
| tree | bf959f2c7e41223c30d1883d26528d40f7f17916 /source | |
| parent | 436f0e7198735d118daa956d0a3bb698571c3cd7 (diff) | |
| parent | e86ab5fff089b90cb037a97d525e819faca1fa73 (diff) | |
Merge branch 'master' into extension
Diffstat (limited to 'source')
| -rw-r--r-- | source/slang/parser.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/slang/parser.cpp b/source/slang/parser.cpp index 1378191ca..7e36b0e71 100644 --- a/source/slang/parser.cpp +++ b/source/slang/parser.cpp @@ -4242,10 +4242,12 @@ namespace Slang DECL(typedef, ParseTypeDef); DECL(associatedtype, parseAssocType); DECL(__generic_param, parseGlobalGenericParamDecl); + DECL(type_param, parseGlobalGenericParamDecl); DECL(cbuffer, parseHLSLCBufferDecl); DECL(tbuffer, parseHLSLTBufferDecl); DECL(__generic, ParseGenericDecl); DECL(__extension, ParseExtensionDecl); + DECL(extension, ParseExtensionDecl); DECL(__init, parseConstructorDecl); DECL(__subscript, ParseSubscriptDecl); DECL(interface, parseInterfaceDecl); |