Merge pull request #157 from tfoleyNV/syntax-lookup

Look up declaration keywords using ordinary scoping.

1 files changed, 8 insertions, 0 deletions

diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp
index e66884923..11d9e6e86 100644
--- a/source/slang/slang.cpp
+++ b/source/slang/slang.cpp
@@ -31,7 +31,15 @@ Session::Session()
     // TODO: load these on-demand to avoid parsing
     // stdlib code for languages the user won't use.
 
+    baseLanguageScope = new Scope();
+
+    auto baseModuleDecl = populateBaseLanguageModule(
+        this,
+        baseLanguageScope);
+    loadedModuleCode.Add(baseModuleDecl);
+
     coreLanguageScope = new Scope();
+    coreLanguageScope->nextSibling = baseLanguageScope;
 
     hlslLanguageScope = new Scope();
     hlslLanguageScope->nextSibling = coreLanguageScope;