Hoisted functions and vars in CompositeCommand

Src/Mass.Core.Tests/MachineFileTests.cs

@@ -97,6 +97,19 @@ public void ExecuteLocalFile()
             Assert.AreEqual(1, a);
         }
 
+        [TestMethod]
+        public void ExecuteHoistedLocalFile()
+        {
+            var result = this.machine.ExecuteFile("MachineFiles\\HoistedLocal.ms", this.machine.RootContext);
+
+            var a = this.machine.RootContext.Get("a");
+
+            Assert.IsNotNull(result);
+            Assert.AreEqual(2, result);
+            Assert.IsNotNull(a);
+            Assert.AreEqual(1, a);
+        }
+
         [TestMethod]
         public void ExecuteGlobalFile()
         {

Src/Mass.Core.Tests/MachineFiles/HoistedLocal.ms

@@ -0,0 +1,14 @@
+
+# file variable
+var a
+a = 1
+
+result = foo() # invoking the function before reach definition
+
+define foo()
+	a = 2 
+	var a # local variable
+end
+
+result
+

Src/Mass.Core.Tests/MachineFiles/Local.ms

@@ -1,5 +1,4 @@
 
-
 # file variable
 var a
 a = 1

Src/Mass.Core.Tests/Mass.Core.Tests.csproj

@@ -279,6 +279,11 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="MachineFiles\HoistedLocal.ms">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Src/Mass.Core/Commands/CompositeCommand.cs

@@ -7,17 +7,43 @@
 
     public class CompositeCommand : ICommand
     {
-        private IList<ICommand> commands;
+        private IList<ICommand> commands = new List<ICommand>();
+        private IList<string> varnames = new List<string>();
+        private IList<ICommand> defines = new List<ICommand>();
 
         public CompositeCommand(IList<ICommand> commands)
         {
-            this.commands = commands;
+            if (commands == null)
+                return;
+
+            foreach (var command in commands)
+            {
+                if (command is DefineCommand) 
+                {
+                    defines.Add(command);
+                    continue;
+                }
+
+                if (command is VarCommand)
+                {
+                    varnames.Add(((VarCommand)command).Name);
+                    continue;
+                }
+
+                this.commands.Add(command);
+            }
         }
 
         public object Execute(Context context)
         {
             object result = null;
 
+            foreach (var varname in this.varnames)
+                context.Set(varname, null, true);
+
+            foreach (var define in this.defines)
+                result = define.Execute(context);
+
             foreach (var command in this.commands)
             {
                 result = command.Execute(context);