[MERGE #363] module runtime #2

Merge pull request #363 from pr/yongqu/module
module runtime #2: merge change with parser; setup localexport slot to facilitate bytecode generation.  Setup ModuleRecord list in JavascriptLibrary to allow ModuleId lookup. Setup ModuleId for bytecode generation. When a new modulerecord is created, it is added to a list (moduleRecordList) in JavascriptLibrary. the index is the moduleID. There is a dependent childModuleRecord dictionary with specifier as key and modulerecord as value, this way we can generate the bytecode using the moduleId. All the local exports are stored in the localExportSlots, used in bytecode generator. Temporary disable anonymous function/class export. Need to fix the anonymous function binding.

Author: Yongqu

lib/Jsrt/Core/JsrtContextCore.h

@@ -162,7 +162,7 @@ class ChakraCoreHostScriptContext sealed : public HostScriptContext
         return GetScriptContext()->GetLibrary()->GetThrowerFunction();
     }
 
-    HRESULT FetchImportedModule(Js::ModuleRecordBase* referencingModule, Js::JavascriptString* specifier, Js::ModuleRecordBase** dependentModuleRecord) override
+    HRESULT FetchImportedModule(Js::ModuleRecordBase* referencingModule, LPCOLESTR specifier, Js::ModuleRecordBase** dependentModuleRecord) override
     {
         AssertMsg(false, "not implemented");
         return S_FALSE;

lib/Parser/Parse.cpp

@@ -2521,9 +2521,20 @@ ParseNodePtr Parser::ParseExportDeclaration()
         {
             pnode = ParseStatement<buildAST>();
 
+            // TODO: fix binding for anonymous function/class 
             if (buildAST)
             {
-                IdentPtr localName = pnode->sxFnc.pid;
+                IdentPtr localName;
+                if (pnode->nop == knopClassDecl)
+                {
+                    localName = pnode->sxClass.pnodeName->sxVar.pid;
+                }
+                else
+                {
+                    Assert(pnode->nop == knopFncDecl);
+                    localName = pnode->sxFnc.pid;
+                }
+                Assert(localName != nullptr);
 
                 AddModuleExportEntry(EnsureModuleLocalExportEntryList(), nullptr, localName, localName, nullptr);
             }

lib/Parser/rterrors.h

@@ -336,3 +336,5 @@ RT_ERROR_MSG(JSERR_FunctionArgument_FirstCannotBeRegExp, 5640, "%s: first argume
 RT_ERROR_MSG(JSERR_RegExpExecInvalidReturnType, 5641, "%s: Return value of RegExp 'exec' is not an Object and is not null", "Return value of RegExp 'exec' is not an Object and is not null", kjstTypeError, 0)
 
 RT_ERROR_MSG(JSERR_ProxyTrapReturnedFalse, 5642, "Proxy trap `%s` returned false", "Proxy trap returned false", kjstTypeError, 0)
+RT_ERROR_MSG(JSERR_ModuleResolveExport, 5643, "Module export %s cannot be resolved", "Module export cannot be resolved", kjstSyntaxError, 0)
+RT_ERROR_MSG(JSERR_TooManyImportExprots, 5644, "Module has too many import/export definitions", "Module has too many import/export definitions", kjstRangeError, 0)

lib/Runtime/Base/ScriptContext.h

@@ -112,7 +112,7 @@ class HostScriptContext
     virtual Js::JavascriptError* CreateWinRTError(IErrorInfo* perrinfo, Js::RestrictedErrorStrings * proerrstr) = 0;
     virtual Js::JavascriptFunction* InitializeHostPromiseContinuationFunction() = 0;
 
-    virtual HRESULT FetchImportedModule(Js::ModuleRecordBase* referencingModule, Js::JavascriptString* specifier, Js::ModuleRecordBase** dependentModuleRecord) = 0;
+    virtual HRESULT FetchImportedModule(Js::ModuleRecordBase* referencingModule, LPCOLESTR specifier, Js::ModuleRecordBase** dependentModuleRecord) = 0;
     virtual HRESULT NotifyHostAboutModuleReady(Js::ModuleRecordBase* referencingModule, Js::Var exceptionVar) = 0;
 
     Js::ScriptContext* GetScriptContext() { return scriptContext; }

lib/Runtime/Language/Chakra.Runtime.Language.vcxproj

@@ -107,10 +107,10 @@
       <ExcludedFromBuild Condition="'$(Platform)'!='Win32' AND '$(Platform)'!='x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)SimdInt16x8Operation.cpp">
-        <ExcludedFromBuild Condition="'$(Platform)'!='ARM' AND '$(Platform)'!='Arm64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Platform)'!='ARM' AND '$(Platform)'!='Arm64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)SimdInt16x8OperationX86X64.cpp">
-        <ExcludedFromBuild Condition="'$(Platform)'!='Win32' AND '$(Platform)'!='x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Platform)'!='Win32' AND '$(Platform)'!='x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)SimdInt8x16Operation.cpp">
       <ExcludedFromBuild Condition="'$(Platform)'!='ARM' AND '$(Platform)'!='Arm64'">true</ExcludedFromBuild>
@@ -154,7 +154,6 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)SimdBool8x16OperationX86X64.cpp">
       <ExcludedFromBuild Condition="'$(Platform)'!='Win32' AND '$(Platform)'!='x64'">true</ExcludedFromBuild>
     </ClCompile>
-
     <ClCompile Include="$(MSBuildThisFileDirectory)SimdUtils.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)SourceDynamicProfileManager.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)StackTraceArguments.cpp" />
@@ -211,6 +210,7 @@
     <ClInclude Include="JavascriptExceptionOperators.h" />
     <ClInclude Include="JavascriptMathOperators.h" />
     <ClInclude Include="JavascriptNativeOperators.h" />
+    <ClInclude Include="ModuleNamespace.h" />
     <ClInclude Include="ProfilingHelpers.h" />
     <ClInclude Include="ReadOnlyDynamicProfileInfo.h" />
     <ClInclude Include="SourceDynamicProfileManager.h" />

lib/Runtime/Language/ModuleRecordBase.h

@@ -12,12 +12,12 @@ namespace Js
     public: 
         const unsigned long ModuleMagicNumber = *(const unsigned long*)"Mode";
         typedef SList<PropertyId> ExportedNames;
-        typedef JsUtil::BaseDictionary<ModuleRecordBase, PropertyId, ArenaAllocator, PrimeSizePolicy> ResolutionDictionary;
+        typedef JsUtil::BaseDictionary<ModuleRecordBase*, PropertyId, ArenaAllocator, PrimeSizePolicy> ResolutionDictionary;
         typedef SList<ModuleRecordBase*> ResolveSet;
         typedef struct ModuleNameRecord 
         {
             ModuleRecordBase* module;
-            LiteralString* bindingName;
+            PropertyId bindingName;
         };
 
         ModuleRecordBase(JavascriptLibrary* library) : 
@@ -31,7 +31,7 @@ namespace Js
 
         virtual ExportedNames* GetExportedNames(ResolveSet* exportStarSet) = 0;
         // return false when "ambiguous". otherwise exportRecord.
-        virtual bool ResolveExport(PropertyId exportName, ResolutionDictionary* resolveSet, ResolveSet* exportStarSet, ModuleNameRecord* exportRecord) = 0;
+        virtual bool ResolveExport(PropertyId exportName, ResolutionDictionary* resolveSet, ResolveSet* exportStarSet, ModuleNameRecord** exportRecord) = 0;
         virtual void ModuleDeclarationInstantiation() = 0;
         virtual Var ModuleEvaluation() = 0;