Merge pull request #372 from csyonghe/master

Allow type expression as type argument, fix global param enum order

1 files changed, 13 insertions, 0 deletions

diff --git a/source/slang/parser.cpp b/source/slang/parser.cpp
index 7e36b0e71..531606f8d 100644
--- a/source/slang/parser.cpp
+++ b/source/slang/parser.cpp
@@ -2704,6 +2704,7 @@ namespace Slang
 
         PushScope(program);
         program->loc = tokenReader.PeekLoc();
+        program->scope = currentScope;
         ParseDeclBody(this, program, TokenType::EndOfFile);
         PopScope();
 
@@ -3960,6 +3961,17 @@ namespace Slang
         return parsePrefixExpr(this);
     }
 
+    RefPtr<Expr> parseTypeFromSourceFile(TranslationUnitRequest*         translationUnit,
+        TokenSpan const&                tokens,
+        DiagnosticSink*                 sink,
+        RefPtr<Scope> const&            outerScope)
+    {
+        Parser parser(tokens, sink, outerScope);
+        parser.translationUnit = translationUnit;
+        parser.currentScope = outerScope;
+        return parser.ParseType();
+    }
+
     // Parse a source file into an existing translation unit
     void parseSourceFile(
         TranslationUnitRequest*         translationUnit,
@@ -3971,6 +3983,7 @@ namespace Slang
 
         parser.translationUnit = translationUnit;
 
+
         return parser.parseSourceFile(translationUnit->SyntaxNode.Ptr());
     }