Permalink
Browse files

Updated to Boo 0.9.4. Had to update to .NET 3.5. Release is missing t…

…he MSBuild Task DLL.

Block properties obsoleted and replaced with Body.

The _context field in AbstractTransformerCompilerStep is no longer protected.  To work around it getting set to null, overrode Dispose to do nothing.
  • Loading branch information...
1 parent 10ad3fb commit 15f1dd6aeeff82fbbb0f6191fcfbcd846ea9cdb6 @ngbrown ngbrown committed Feb 5, 2011
View
6 Rhino.DSL.Tests/BlockToArgumentsTestFixture.cs
@@ -13,14 +13,14 @@ public void Expression_statement_is_transformed()
MacroStatement fixture = new MacroStatement(new LexicalInfo("test", 1, 1));
fixture.Name = "DoStuff";
- fixture.Block = new Block();
- fixture.Block.Add(doStuffStatement);
+ fixture.Body = new Block();
+ fixture.Body.Add(doStuffStatement);
BlockToArgumentsTransformer transformer = new BlockToArgumentsTransformer("DoStuff");
transformer.Visit(fixture);
Assert.Equal(exp, fixture.Arguments[0]);
- Assert.False(fixture.Block.HasStatements, "MacroStatement block should be empty after transformation.");
+ Assert.True(fixture.Body.IsEmpty, "MacroStatement block should be empty after transformation.");
}
[Fact]
View
15 Rhino.DSL/AutoReferenceFilesCompilerStep.cs
@@ -188,9 +188,7 @@ private static TextReader ResolveFile(string url, string basePath)
private Assembly CompileAssembly(Node node, string url, CompilerErrorCollection errors)
{
- CompilerContext oldContext = Context;
CompilerContext result = Compile(url);
- _context = oldContext;
if (result.Errors.Count > 0)
{
errors.Add(new CompilerError(node.LexicalInfo, "Failed to add a file reference"));
@@ -231,7 +229,10 @@ private static CompilerParameters SafeCloneParameters(CompilerParameters paramet
// cloned.Input - we don't want to copy that
cloned.KeyContainer = parameters.KeyContainer;
cloned.KeyFile = parameters.KeyFile;
- cloned.LibPaths.AddRange(parameters.LibPaths);
+ foreach (var libPath in parameters.LibPaths)
+ {
+ cloned.LibPaths.Add(libPath);
+ }
// cloned.OutputAssembly - we don't want that either
// always want that, since we are compiling to add a reference
@@ -252,5 +253,13 @@ public override void Run()
{
Visit(CompileUnit);
}
+
+ /// <summary>
+ /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+ /// </summary>
+ public override void Dispose()
+ {
+ // Do nothing on dispose since we want to keep the Context through multiple pipeline runs.
+ }
}
}
View
2 Rhino.DSL/Rhino.DSL-vs2008.csproj
@@ -16,6 +16,8 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>2.0</OldToolsVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
View
3 Rhino.DSL/Rhino.DSL-vs2010.csproj
@@ -17,7 +17,8 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
View
BIN SharedLibs/Boo.Lang.CodeDom.dll
Binary file not shown.
View
BIN SharedLibs/Boo.Lang.Compiler.dll
Binary file not shown.
View
BIN SharedLibs/Boo.Lang.Extensions.dll
Binary file not shown.
View
BIN SharedLibs/Boo.Lang.Interpreter.dll
Binary file not shown.
View
BIN SharedLibs/Boo.Lang.Parser.dll
Binary file not shown.
View
BIN SharedLibs/Boo.Lang.PatternMatching.dll
Binary file not shown.
View
BIN SharedLibs/Boo.Lang.Useful.dll
Binary file not shown.
View
BIN SharedLibs/Boo.Lang.dll
Binary file not shown.
View
BIN SharedLibs/Boo.Microsoft.Build.Tasks.dll
Binary file not shown.
View
BIN SharedLibs/Boo.NAnt.Tasks.dll
Binary file not shown.
View
BIN SharedLibs/boo.exe
Binary file not shown.
View
BIN SharedLibs/booc.exe
Binary file not shown.
View
3 SharedLibs/booc.exe.config
@@ -1,4 +1,7 @@
<configuration>
+<runtime>
+<NetFx40_LegacySecurityPolicy enabled="true" />
+</runtime>
<startup>
<supportedRuntime version="v2.0.50727"/>
<supportedRuntime version="v1.1.4322"/>
View
BIN SharedLibs/booi.exe
Binary file not shown.
View
3 SharedLibs/booi.exe.config
@@ -1,4 +1,7 @@
<configuration>
+<runtime>
+<NetFx40_LegacySecurityPolicy enabled="true" />
+</runtime>
<startup>
<supportedRuntime version="v2.0.50727"/>
<supportedRuntime version="v1.1.4322"/>
View
BIN SharedLibs/booish.exe
Binary file not shown.
View
3 SharedLibs/booish.exe.config
@@ -1,4 +1,7 @@
<configuration>
+<runtime>
+<NetFx40_LegacySecurityPolicy enabled="true" />
+</runtime>
<startup>
<supportedRuntime version="v2.0.50727"/>
<supportedRuntime version="v1.1.4322"/>

0 comments on commit 15f1dd6

Please sign in to comment.