Merge pull request #372 from csyonghe/master

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

1 files changed, 45 insertions, 1 deletions

diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp
index 2ebf024e3..4c9ecf8a8 100644
--- a/source/slang/slang.cpp
+++ b/source/slang/slang.cpp
@@ -125,6 +125,50 @@ CompileRequest::CompileRequest(Session* session)
 CompileRequest::~CompileRequest()
 {}
 
+
+RefPtr<Expr> CompileRequest::parseTypeString(TranslationUnitRequest * translationUnit, String typeStr, RefPtr<Scope> scope)
+{
+    Slang::SourceFile srcFile;
+    srcFile.content = typeStr;
+    DiagnosticSink sink;
+    sink.sourceManager = sourceManager;
+    auto tokens = preprocessSource(
+        &srcFile,
+        &sink,
+        nullptr,
+        Dictionary<String,String>(),
+        translationUnit);
+    return parseTypeFromSourceFile(translationUnit, tokens, &sink, scope);
+}
+
+RefPtr<Type> checkProperType(TranslationUnitRequest * tu, TypeExp typeExp);
+Type* CompileRequest::getTypeFromString(String typeStr)
+{
+    RefPtr<Type> type;
+    if (types.TryGetValue(typeStr, type))
+        return type;
+    auto translationUnit = translationUnits.First();
+    List<RefPtr<Scope>> scopesToTry;
+    for (auto tu : translationUnits)
+        scopesToTry.Add(tu->SyntaxNode->scope);
+    for (auto & module : loadedModulesList)
+        scopesToTry.Add(module->moduleDecl->scope);
+    // parse type name
+    for (auto & s : scopesToTry)
+    {
+        RefPtr<Expr> typeExpr = parseTypeString(translationUnit,
+            typeStr, s);
+        type = checkProperType(translationUnit, TypeExp(typeExpr));
+        if (type)
+            break;
+    }
+    if (type)
+    {
+        types[typeStr] = type;
+    }
+    return type.Ptr();
+}
+
 void CompileRequest::parseTranslationUnit(
     TranslationUnitRequest* translationUnit)
 {
@@ -429,7 +473,7 @@ int CompileRequest::addEntryPoint(
     entryPoint->profile = entryPointProfile;
     entryPoint->translationUnitIndex = translationUnitIndex;
     for (auto typeName : genericTypeNames)
-        entryPoint->genericParameterTypeNames.Add(getNamePool()->getName(typeName));
+        entryPoint->genericParameterTypeNames.Add(typeName);
     auto translationUnit = translationUnits[translationUnitIndex].Ptr();
     translationUnit->entryPoints.Add(entryPoint);