From 32af15931a19eb053da1d497d3a6f677f2fa1f8d Mon Sep 17 00:00:00 2001 From: David Miller Date: Sat, 31 Oct 2009 21:07:49 -0500 Subject: [PATCH] Fixed breakage caused by DLR namespace change. --- .../Clojure.Compile/Clojure.Compile.csproj | 4 +- Clojure/Clojure.Main/Clojure.Main.csproj | 4 +- Clojure/Clojure.Tests/Clojure.Tests.csproj | 12 +- .../Clojure.Tests/LibTests/ISeqTestHelper.cs | 2 +- .../Clojure.Tests/LibTests/LispReaderTests.cs | 212 +++++++++--------- Clojure/Clojure/CljCompiler/Ast/AssignExpr.cs | 7 +- .../Clojure/CljCompiler/Ast/AssignableExpr.cs | 7 +- Clojure/Clojure/CljCompiler/Ast/BodyExpr.cs | 6 +- .../Clojure/CljCompiler/Ast/BooleanExpr.cs | 7 +- .../Clojure/CljCompiler/Ast/ConstantExpr.cs | 7 +- Clojure/Clojure/CljCompiler/Ast/DefExpr.cs | 7 +- Clojure/Clojure/CljCompiler/Ast/EmptyExpr.cs | 7 +- Clojure/Clojure/CljCompiler/Ast/Expr.cs | 6 +- Clojure/Clojure/CljCompiler/Ast/FieldExpr.cs | 7 +- Clojure/Clojure/CljCompiler/Ast/FnExpr.cs | 6 +- Clojure/Clojure/CljCompiler/Ast/FnMethod.cs | 7 +- Clojure/Clojure/CljCompiler/Ast/GenContext.cs | 7 +- Clojure/Clojure/CljCompiler/Ast/HostExpr.cs | 7 +- Clojure/Clojure/CljCompiler/Ast/IfExpr.cs | 7 +- Clojure/Clojure/CljCompiler/Ast/ImportExpr.cs | 6 +- .../CljCompiler/Ast/InstanceFieldExpr.cs | 7 +- .../CljCompiler/Ast/InstanceMethodExpr.cs | 6 +- Clojure/Clojure/CljCompiler/Ast/InvokeExpr.cs | 7 +- .../Clojure/CljCompiler/Ast/KeywordExpr.cs | 6 +- Clojure/Clojure/CljCompiler/Ast/LetExpr.cs | 6 +- Clojure/Clojure/CljCompiler/Ast/LetFnExpr.cs | 7 +- .../Clojure/CljCompiler/Ast/LiteralExpr.cs | 6 +- .../Clojure/CljCompiler/Ast/LocalBinding.cs | 7 +- .../CljCompiler/Ast/LocalBindingExpr.cs | 6 +- Clojure/Clojure/CljCompiler/Ast/MapExpr.cs | 7 +- .../CljCompiler/Ast/MaybePrimitiveExpr.cs | 6 +- Clojure/Clojure/CljCompiler/Ast/MetaExpr.cs | 7 +- .../CljCompiler/Ast/MonitorEnterExpr.cs | 6 +- .../CljCompiler/Ast/MonitorExitExpr.cs | 7 +- Clojure/Clojure/CljCompiler/Ast/NewExpr.cs | 7 +- Clojure/Clojure/CljCompiler/Ast/NilExpr.cs | 6 +- Clojure/Clojure/CljCompiler/Ast/RecurExpr.cs | 7 +- Clojure/Clojure/CljCompiler/Ast/SetExpr.cs | 6 +- .../CljCompiler/Ast/StaticFieldExpr.cs | 6 +- .../CljCompiler/Ast/StaticMethodExpr.cs | 7 +- Clojure/Clojure/CljCompiler/Ast/StringExpr.cs | 6 +- Clojure/Clojure/CljCompiler/Ast/TheVarExpr.cs | 7 +- Clojure/Clojure/CljCompiler/Ast/ThrowExpr.cs | 7 +- Clojure/Clojure/CljCompiler/Ast/TryExpr.cs | 7 +- .../CljCompiler/Ast/UnresolvedVarExpr.cs | 7 +- Clojure/Clojure/CljCompiler/Ast/VarExpr.cs | 6 +- Clojure/Clojure/CljCompiler/Ast/VectorExpr.cs | 7 +- Clojure/Clojure/CljCompiler/Compiler.cs | 6 +- Clojure/Clojure/CljCompiler/GenDelegate.cs | 19 +- Clojure/Clojure/Clojure.csproj | 8 +- Clojure/ClojureCLR.sln | 139 ++++++++++-- Clojure/Simple.Console/Simple.Console.csproj | 4 +- Clojure/Simple.Console/SimpleConsole.cs | 8 +- 53 files changed, 510 insertions(+), 186 deletions(-) diff --git a/Clojure/Clojure.Compile/Clojure.Compile.csproj b/Clojure/Clojure.Compile/Clojure.Compile.csproj index 7248210d9..94b298bb3 100644 --- a/Clojure/Clojure.Compile/Clojure.Compile.csproj +++ b/Clojure/Clojure.Compile/Clojure.Compile.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 9.0.30729 + 9.0.21022 2.0 {3DBF3359-43B5-47C9-9E4D-CF50D7587F20} Exe @@ -18,7 +18,7 @@ full false bin\Debug\ - DEBUG;TRACE + TRACE;DEBUG;CLR2 prompt 4 diff --git a/Clojure/Clojure.Main/Clojure.Main.csproj b/Clojure/Clojure.Main/Clojure.Main.csproj index 38c1f36d9..e1c831447 100644 --- a/Clojure/Clojure.Main/Clojure.Main.csproj +++ b/Clojure/Clojure.Main/Clojure.Main.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 9.0.30729 + 9.0.21022 2.0 {A9B3BA9E-6955-43E6-9846-54DEFEDCFBFC} Exe @@ -18,7 +18,7 @@ full false bin\Debug\ - DEBUG;TRACE + TRACE;DEBUG;CLR2 prompt 4 diff --git a/Clojure/Clojure.Tests/Clojure.Tests.csproj b/Clojure/Clojure.Tests/Clojure.Tests.csproj index e240b3a9a..b75a7eea1 100644 --- a/Clojure/Clojure.Tests/Clojure.Tests.csproj +++ b/Clojure/Clojure.Tests/Clojure.Tests.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 9.0.30729 + 9.0.21022 2.0 {656E1517-B0CA-47B4-B068-3DF43DC41F8A} Library @@ -20,7 +20,7 @@ full false bin\Debug\ - DEBUG;TRACE + TRACE;DEBUG;CLR2 prompt 4 @@ -35,16 +35,16 @@ False - ..\..\..\..\dev\RhinoMocks\Castle.Core.dll + ..\..\..\RhinoMocks\Castle.Core.dll False - ..\..\..\..\dev\RhinoMocks\Castle.DynamicProxy2.dll + ..\..\..\RhinoMocks\Castle.DynamicProxy2.dll - + False - ..\..\..\..\dev\RhinoMocks\Rhino.Mocks.dll + ..\..\..\RhinoMocks\Rhino.Mocks.dll diff --git a/Clojure/Clojure.Tests/LibTests/ISeqTestHelper.cs b/Clojure/Clojure.Tests/LibTests/ISeqTestHelper.cs index 238afb0c1..91fed52d4 100644 --- a/Clojure/Clojure.Tests/LibTests/ISeqTestHelper.cs +++ b/Clojure/Clojure.Tests/LibTests/ISeqTestHelper.cs @@ -40,7 +40,7 @@ public void VerifyISeqCons(ISeq s, object newVal, IList values) public void VerifyISeqRestTypes(ISeq s, Type type) { for ( ; s.next() != null; s = s.next()) - Expect(s.next(), InstanceOfType(type)); + Expect(s.next(), InstanceOf(type)); } public void VerifyISeqRestMaintainsMeta(ISeq s) diff --git a/Clojure/Clojure.Tests/LibTests/LispReaderTests.cs b/Clojure/Clojure.Tests/LibTests/LispReaderTests.cs index 3aad3802a..0a7b888bc 100644 --- a/Clojure/Clojure.Tests/LibTests/LispReaderTests.cs +++ b/Clojure/Clojure.Tests/LibTests/LispReaderTests.cs @@ -794,7 +794,7 @@ public void CanReadBasicList() public void CanReadEmptyList() { Object o1 = ReadFromString("( )"); - Expect(o1, InstanceOfType(typeof(IPersistentList))); + Expect(o1, InstanceOf(typeof(IPersistentList))); IPersistentList pl = o1 as IPersistentList; Expect(pl.count(), EqualTo(0)); } @@ -803,11 +803,11 @@ public void CanReadEmptyList() public void CanReadNestedList() { Object o1 = ReadFromString("(a (b c) d)"); - Expect(o1, InstanceOfType(typeof(IPersistentList))); + Expect(o1, InstanceOf(typeof(IPersistentList))); IPersistentList pl = o1 as IPersistentList; ISeq seq = pl.seq(); Expect(pl.count(), EqualTo(3)); - Expect(seq.next().first(), InstanceOfType(typeof(IPersistentList))); + Expect(seq.next().first(), InstanceOf(typeof(IPersistentList))); IPersistentList sub = seq.next().first() as IPersistentList; Expect(sub.count(), EqualTo(2)); } @@ -823,7 +823,7 @@ public void MissingListTerminatorFails() public void ListGetsLineNumber() { Object o1 = ReadFromStringNumbering("\n\n(a b \n1 2)"); - Expect(o1, InstanceOfType(typeof(IObj))); + Expect(o1, InstanceOf(typeof(IObj))); IObj io = o1 as IObj; Expect(io.meta().valAt(Keyword.intern(null,"line")), EqualTo(3)); } @@ -850,7 +850,7 @@ public void CanReadBasicVector() public void CanReadEmptyVector() { Object o1 = ReadFromString("[ ]"); - Expect(o1, InstanceOfType(typeof(IPersistentVector))); + Expect(o1, InstanceOf(typeof(IPersistentVector))); IPersistentVector v = o1 as IPersistentVector; Expect(v.count(), EqualTo(0)); } @@ -859,10 +859,10 @@ public void CanReadEmptyVector() public void VectorCanContainNestedList() { Object o1 = ReadFromString("[a (b c) d]"); - Expect(o1, InstanceOfType(typeof(IPersistentVector))); + Expect(o1, InstanceOf(typeof(IPersistentVector))); IPersistentVector v = o1 as IPersistentVector; Expect(v.count(), EqualTo(3)); - Expect(v.nth(1), InstanceOfType(typeof(IPersistentList))); + Expect(v.nth(1), InstanceOf(typeof(IPersistentList))); IPersistentList sub = v.nth(1) as IPersistentList; Expect(sub.count(), EqualTo(2)); } @@ -871,10 +871,10 @@ public void VectorCanContainNestedList() public void VectorCanContainNestedVector() { Object o1 = ReadFromString("[a [b c] d]"); - Expect(o1, InstanceOfType(typeof(IPersistentVector))); + Expect(o1, InstanceOf(typeof(IPersistentVector))); IPersistentVector v = o1 as IPersistentVector; Expect(v.count(), EqualTo(3)); - Expect(v.nth(1), InstanceOfType(typeof(IPersistentVector))); + Expect(v.nth(1), InstanceOf(typeof(IPersistentVector))); IPersistentVector sub = v.nth(1) as IPersistentVector; Expect(sub.count(), EqualTo(2)); } @@ -894,7 +894,7 @@ public void MissingVectorTerminatorFails() public void CanReadBasicMap() { Object o1 = ReadFromString("{:abc 12 14 a}"); - Expect(o1, InstanceOfType(typeof(IPersistentMap))); + Expect(o1, InstanceOf(typeof(IPersistentMap))); IPersistentMap m = o1 as IPersistentMap; Expect(m.count(), EqualTo(2)); Expect(m.valAt(Keyword.intern(null, "abc")), EqualTo(12)); @@ -905,7 +905,7 @@ public void CanReadBasicMap() public void CanReadEmptyMap() { Object o1 = ReadFromString("{ }"); - Expect(o1, InstanceOfType(typeof(IPersistentMap))); + Expect(o1, InstanceOf(typeof(IPersistentMap))); IPersistentMap m = o1 as IPersistentMap; Expect(m.count(), EqualTo(0)); } @@ -935,7 +935,7 @@ public void MissingRightBraceFails() public void CanReadBasicSet() { Object o1 = ReadFromString("#{abc 12}"); - Expect(o1, InstanceOfType(typeof(IPersistentSet))); + Expect(o1, InstanceOf(typeof(IPersistentSet))); IPersistentSet s = o1 as IPersistentSet; Expect(s.count(), EqualTo(2)); Expect(s.contains(Symbol.intern("abc"))); @@ -946,7 +946,7 @@ public void CanReadBasicSet() public void CanReadEmptySet() { Object o1 = ReadFromString("#{ }"); - Expect(o1, InstanceOfType(typeof(IPersistentSet))); + Expect(o1, InstanceOf(typeof(IPersistentSet))); IPersistentSet s = o1 as IPersistentSet; Expect(s.count(), EqualTo(0)); } @@ -999,7 +999,7 @@ public void MismatchedDelimiterIsBad() public void QuoteWraps() { object o1 = ReadFromString("'a"); - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.count(), EqualTo(2)); Expect(s.first(),EqualTo(Symbol.intern("quote"))); @@ -1010,11 +1010,11 @@ public void QuoteWraps() public void QuoteWraps2() { object o1 = ReadFromString("'(a b c)"); - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.count(), EqualTo(2)); Expect(s.first(), EqualTo(Symbol.intern("quote"))); - Expect(s.next().first(), InstanceOfType(typeof(IPersistentList))); + Expect(s.next().first(), InstanceOf(typeof(IPersistentList))); Expect(((IPersistentList)s.next().first()).count(), EqualTo(3)); } @@ -1023,7 +1023,7 @@ public void QuoteWraps2() public void MetaWraps() { object o1 = ReadFromString("^a"); - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.count(), EqualTo(2)); Expect(s.first(), EqualTo(Symbol.intern("clojure.core","meta"))); @@ -1034,11 +1034,11 @@ public void MetaWraps() public void MetaWraps2() { object o1 = ReadFromString("^(a b c)"); - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.count(), EqualTo(2)); Expect(s.first(), EqualTo(Symbol.intern("clojure.core", "meta"))); - Expect(s.next().first(), InstanceOfType(typeof(IPersistentList))); + Expect(s.next().first(), InstanceOf(typeof(IPersistentList))); Expect(((IPersistentList)s.next().first()).count(), EqualTo(3)); } @@ -1046,7 +1046,7 @@ public void MetaWraps2() public void DerefWraps() { object o1 = ReadFromString("@a"); - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.count(), EqualTo(2)); Expect(s.first(), EqualTo(Symbol.intern("clojure.core", "deref"))); @@ -1057,11 +1057,11 @@ public void DerefWraps() public void DerefWraps2() { object o1 = ReadFromString("@(a b c)"); - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.count(), EqualTo(2)); Expect(s.first(), EqualTo(Symbol.intern("clojure.core", "deref"))); - Expect(s.next().first(), InstanceOfType(typeof(IPersistentList))); + Expect(s.next().first(), InstanceOf(typeof(IPersistentList))); Expect(((IPersistentList)s.next().first()).count(), EqualTo(3)); } @@ -1091,11 +1091,11 @@ public void SQOnSelfEvaluatingReturnsQuotedThing() public void SQOnSpecialFormQuotes() { object o1 = ReadFromString("`def"); - Expect(o1,InstanceOfType(typeof(ISeq))); + Expect(o1,InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.count(),EqualTo(2) ); Expect(s.first(),EqualTo(Symbol.intern("quote"))); - Expect(s.next().first(),InstanceOfType(typeof(Symbol))); + Expect(s.next().first(),InstanceOf(typeof(Symbol))); Symbol sym = s.next().first() as Symbol; Expect(sym.Namespace, Null); Expect(sym.Name, EqualTo("def")); @@ -1105,11 +1105,11 @@ public void SQOnSpecialFormQuotes() public void SQOnRegularSymbolResolves() { object o1 = ReadFromString("`abc"); - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.count(), EqualTo(2)); Expect(s.first(), EqualTo(Symbol.intern("quote"))); - Expect(s.next().first(), InstanceOfType(typeof(Symbol))); + Expect(s.next().first(), InstanceOf(typeof(Symbol))); Symbol sym = s.next().first() as Symbol; Expect(sym.Namespace, EqualTo(((Namespace)RT.CURRENT_NS.deref()).Name.Name)); Expect(sym.Name, EqualTo("abc")); @@ -1119,11 +1119,11 @@ public void SQOnRegularSymbolResolves() public void SQOnGensymGenerates() { object o1 = ReadFromString("`abc#"); - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.count(), EqualTo(2)); Expect(s.first(), EqualTo(Symbol.intern("quote"))); - Expect(s.next().first(), InstanceOfType(typeof(Symbol))); + Expect(s.next().first(), InstanceOf(typeof(Symbol))); Symbol sym = s.next().first() as Symbol; Expect(sym.Namespace, Null); Expect(sym.Name.StartsWith("abc_")); ; @@ -1139,32 +1139,32 @@ public void SQOnGensymSeesSameTwice() // (clojure/list (quote abc__N))))) string str = o1.ToString(); - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.count(),EqualTo(2)); Expect(s.first(),EqualTo(Symbol.intern("clojure.core","seq"))); - Expect(s.next().first(),InstanceOfType(typeof(ISeq))); + Expect(s.next().first(),InstanceOf(typeof(ISeq))); ISeq s1 = s.next().first() as ISeq; Expect(s1.count(), EqualTo(3)); Expect(s1.first(), EqualTo(Symbol.intern("clojure.core","concat"))); - Expect(s1.next().first(), InstanceOfType(typeof(ISeq))); + Expect(s1.next().first(), InstanceOf(typeof(ISeq))); ISeq s2 = s1.next().first() as ISeq; Expect(s2.count(), EqualTo(2)); - Expect(s2.next().first(), InstanceOfType(typeof(ISeq))); + Expect(s2.next().first(), InstanceOf(typeof(ISeq))); ISeq s2a = s2.next().first() as ISeq; - Expect(s2a.next().first(), InstanceOfType(typeof(Symbol))); + Expect(s2a.next().first(), InstanceOf(typeof(Symbol))); Symbol sym1 = s2a.next().first() as Symbol; - Expect(s1.next().next().first(), InstanceOfType(typeof(ISeq))); + Expect(s1.next().next().first(), InstanceOf(typeof(ISeq))); ISeq s3 = s1.next().next().first() as ISeq; Expect(s3.count(), EqualTo(2)); - Expect(s3.next().first(), InstanceOfType(typeof(ISeq))); + Expect(s3.next().first(), InstanceOf(typeof(ISeq))); ISeq s3a = s3.next().first() as ISeq; - Expect(s3a.next().first(), InstanceOfType(typeof(Symbol))); + Expect(s3a.next().first(), InstanceOf(typeof(Symbol))); Symbol sym2 = s3a.next().first() as Symbol; Expect(sym1.Namespace, Null); @@ -1184,26 +1184,26 @@ public void SQOnMapMakesMap() // (clojure/list :b) // (clojure/list 2)))) - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.count(), EqualTo(3)); Expect(s.first(), EqualTo(Symbol.intern("clojure.core/apply"))); Expect(s.next().first(), EqualTo(Symbol.intern("clojure.core/hash-map"))); - Expect(s.next().next().first(), InstanceOfType(typeof(ISeq))); + Expect(s.next().next().first(), InstanceOf(typeof(ISeq))); ISeq s0 = s.next().next().first() as ISeq; ISeq s2; Expect(s0.count(), EqualTo(2)); Expect(s0.first(), EqualTo(Symbol.intern("clojure.core/seq"))); - Expect(s0.next().first(),InstanceOfType(typeof(ISeq))); + Expect(s0.next().first(),InstanceOf(typeof(ISeq))); ISeq s1 = s0.next().first() as ISeq; Expect(s1.count(), EqualTo(5)); Expect(s1.first(), EqualTo(Symbol.intern("clojure.core/concat"))); s1 = s1.next(); - Expect(s1.first(),InstanceOfType(typeof(ISeq))); + Expect(s1.first(),InstanceOf(typeof(ISeq))); s2 = s1.first() as ISeq; Expect(s2.first(),EqualTo(Symbol.intern("clojure.core/list"))); @@ -1211,14 +1211,14 @@ public void SQOnMapMakesMap() s1 = s1.next(); - Expect(s1.first(), InstanceOfType(typeof(ISeq))); + Expect(s1.first(), InstanceOf(typeof(ISeq))); s2 = s1.first() as ISeq; Expect(s2.first(), EqualTo(Symbol.intern("clojure.core/list"))); Expect(s2.next().first(), EqualTo(1)); s1 = s1.next(); - Expect(s1.first(), InstanceOfType(typeof(ISeq))); + Expect(s1.first(), InstanceOf(typeof(ISeq))); s2 = s1.first() as ISeq; Expect(s2.first(), EqualTo(Symbol.intern("clojure.core/list"))); @@ -1226,7 +1226,7 @@ public void SQOnMapMakesMap() s1 = s1.next(); - Expect(s1.first(), InstanceOfType(typeof(ISeq))); + Expect(s1.first(), InstanceOf(typeof(ISeq))); s2 = s1.first() as ISeq; Expect(s2.first(), EqualTo(Symbol.intern("clojure.core/list"))); @@ -1241,12 +1241,12 @@ public void SQOnVectorMakesVector() // (clojure/concat (clojure/list :b) // (clojure/list 2))) - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.count(), EqualTo(3)); Expect(s.first(), EqualTo(Symbol.intern("clojure.core/apply"))); Expect(s.next().first(), EqualTo(Symbol.intern("clojure.core/vector"))); - Expect(s.next().next().first(), InstanceOfType(typeof(ISeq))); + Expect(s.next().next().first(), InstanceOf(typeof(ISeq))); ISeq s1 = s.next().next().first() as ISeq; ISeq s2; @@ -1255,7 +1255,7 @@ public void SQOnVectorMakesVector() Expect(s1.first(), EqualTo(Symbol.intern("clojure.core/concat"))); s1 = s1.next(); - Expect(s1.first(), InstanceOfType(typeof(ISeq))); + Expect(s1.first(), InstanceOf(typeof(ISeq))); s2 = s1.first() as ISeq; Expect(s2.first(), EqualTo(Symbol.intern("clojure.core/list"))); @@ -1263,7 +1263,7 @@ public void SQOnVectorMakesVector() s1 = s1.next(); - Expect(s1.first(), InstanceOfType(typeof(ISeq))); + Expect(s1.first(), InstanceOf(typeof(ISeq))); s2 = s1.first() as ISeq; Expect(s2.first(), EqualTo(Symbol.intern("clojure.core/list"))); @@ -1280,17 +1280,17 @@ public void SQOnSetMakesSet() // (clojure/concat (clojure/list :b) // (clojure/list 2)))) - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.count(), EqualTo(3)); Expect(s.first(), EqualTo(Symbol.intern("clojure.core/apply"))); Expect(s.next().first(), EqualTo(Symbol.intern("clojure.core/hash-set"))); - Expect(s.next().next().first(), InstanceOfType(typeof(ISeq))); + Expect(s.next().next().first(), InstanceOf(typeof(ISeq))); ISeq s0 = s.next().next().first() as ISeq; Expect(s0.count(), EqualTo(2)); Expect(s0.first(),EqualTo(Symbol.intern("clojure.core/seq"))); - Expect(s0.next().first(),InstanceOfType(typeof(ISeq))); + Expect(s0.next().first(),InstanceOf(typeof(ISeq))); ISeq s1 = s0.next().first() as ISeq; @@ -1298,10 +1298,10 @@ public void SQOnSetMakesSet() Expect(s1.first(), EqualTo(Symbol.intern("clojure.core/concat"))); s1 = s1.next(); - Expect(s1.first(), InstanceOfType(typeof(ISeq))); + Expect(s1.first(), InstanceOf(typeof(ISeq))); ISeq s2 = s1.first() as ISeq; s1 = s1.next(); - Expect(s1.first(), InstanceOfType(typeof(ISeq))); + Expect(s1.first(), InstanceOf(typeof(ISeq))); ISeq s3 = s1.first() as ISeq; Expect(s2.first(), EqualTo(Symbol.intern("clojure.core/list"))); @@ -1325,12 +1325,12 @@ public void SQOnListMakesList() // (clojure/seq (clojure/concat (clojure/list :b) // (clojure/list 2)))) - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s0 = o1 as ISeq; Expect(s0.count(), EqualTo(2)); Expect(s0.first(), EqualTo(Symbol.intern("clojure.core/seq"))); - Expect(s0.next().first(),InstanceOfType(typeof(ISeq))); + Expect(s0.next().first(),InstanceOf(typeof(ISeq))); ISeq s1 = s0.next().first() as ISeq; ISeq s2; @@ -1338,7 +1338,7 @@ public void SQOnListMakesList() Expect(s1.first(), EqualTo(Symbol.intern("clojure.core/concat"))); s1 = s1.next(); - Expect(s1.first(), InstanceOfType(typeof(ISeq))); + Expect(s1.first(), InstanceOf(typeof(ISeq))); s2 = s1.first() as ISeq; Expect(s2.first(), EqualTo(Symbol.intern("clojure.core/list"))); @@ -1346,7 +1346,7 @@ public void SQOnListMakesList() s1 = s1.next(); - Expect(s1.first(), InstanceOfType(typeof(ISeq))); + Expect(s1.first(), InstanceOf(typeof(ISeq))); s2 = s1.first() as ISeq; Expect(s2.first(), EqualTo(Symbol.intern("clojure.core/list"))); @@ -1359,10 +1359,10 @@ public void UnquoteStandaloneReturnsUnquoteObject() { object o1 = ReadFromString("~x"); - //Expect(o1, InstanceOfType(typeof(LispReader.Unquote))); + //Expect(o1, InstanceOf(typeof(LispReader.Unquote))); //LispReader.Unquote u = o1 as LispReader.Unquote; //Expect(u.Obj, EqualTo(Symbol.intern("x"))); - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.first(), EqualTo(Symbol.intern("clojure.core/unquote"))); Expect(s.next().first(), EqualTo(Symbol.intern("x"))); @@ -1375,7 +1375,7 @@ public void UnquoteSpliceStandaloneReturnsUnquoteSpliceObject() { object o1 = ReadFromString("~@x"); - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.first(), EqualTo(Symbol.intern("clojure.core/unquote-splicing"))); Expect(s.next().first(), EqualTo(Symbol.intern("x"))); @@ -1390,12 +1390,12 @@ public void SQonUnquoteDequotes() // (clojure/list b))) - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s0 = o1 as ISeq; Expect(s0.count(),EqualTo(2)); Expect(s0.first(),EqualTo(Symbol.intern("clojure.core/seq"))); - Expect(s0.next().first(),InstanceOfType(typeof(ISeq))); + Expect(s0.next().first(),InstanceOf(typeof(ISeq))); ISeq s1 = s0.next().first() as ISeq; ISeq s2; @@ -1404,11 +1404,11 @@ public void SQonUnquoteDequotes() Expect(s1.first(), EqualTo(Symbol.intern("clojure.core/concat"))); s1 = s1.next(); - Expect(s1.first(), InstanceOfType(typeof(ISeq))); + Expect(s1.first(), InstanceOf(typeof(ISeq))); s2 = s1.first() as ISeq; Expect(s2.first(), EqualTo(Symbol.intern("clojure.core/list"))); - Expect(s2.next().first(), InstanceOfType(typeof(ISeq))); + Expect(s2.next().first(), InstanceOf(typeof(ISeq))); ISeq s3 = s2.next().first() as ISeq; Expect(s3.count(), EqualTo(2)); @@ -1417,7 +1417,7 @@ public void SQonUnquoteDequotes() s1 = s1.next(); - Expect(s1.first(), InstanceOfType(typeof(ISeq))); + Expect(s1.first(), InstanceOf(typeof(ISeq))); s2 = s1.first() as ISeq; Expect(s2.first(), EqualTo(Symbol.intern("clojure.core/list"))); @@ -1437,12 +1437,12 @@ public void SqOnUnquoteSpliceSplices() object o1 = ReadFromString("`(a ~@b)"); // (clojure/seq (clojure/concat (clojure/list (quote user/a)) b)) - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s0 = o1 as ISeq; Expect(s0.count(), EqualTo(2)); Expect(s0.first(), EqualTo(Symbol.intern("clojure.core/seq"))); - Expect(s0.next().first(), InstanceOfType(typeof(ISeq))); + Expect(s0.next().first(), InstanceOf(typeof(ISeq))); ISeq s1 = s0.next().first() as ISeq; ISeq s2; @@ -1451,11 +1451,11 @@ public void SqOnUnquoteSpliceSplices() Expect(s1.first(), EqualTo(Symbol.intern("clojure.core/concat"))); s1 = s1.next(); - Expect(s1.first(), InstanceOfType(typeof(ISeq))); + Expect(s1.first(), InstanceOf(typeof(ISeq))); s2 = s1.first() as ISeq; Expect(s2.first(), EqualTo(Symbol.intern("clojure.core/list"))); - Expect(s2.next().first(), InstanceOfType(typeof(ISeq))); + Expect(s2.next().first(), InstanceOf(typeof(ISeq))); ISeq s3 = s2.next().first() as ISeq; Expect(s3.count(), EqualTo(2)); @@ -1474,7 +1474,7 @@ public void SQOnLparenRParenReturnsEmptyList() { object o1 = ReadFromString("`()"); // (clojure/list) - Expect(o1,InstanceOfType(typeof(ISeq))); + Expect(o1,InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.count(),EqualTo(1)); Expect(s.first(),EqualTo(Symbol.intern("clojure.core/list"))); @@ -1514,16 +1514,16 @@ public void MetaAppliesHashMetaDataToObject() { object o1 = ReadFromString("#^{a 1} (a b)"); - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.count(), EqualTo(2)); Expect(s.first(), EqualTo(Symbol.intern("a"))); Expect(s.next().first(), EqualTo(Symbol.intern("b"))); - Expect(o1, InstanceOfType(typeof(IObj))); + Expect(o1, InstanceOf(typeof(IObj))); IObj o = o1 as IObj; - Expect(o.meta(), InstanceOfType(typeof(IPersistentMap))); + Expect(o.meta(), InstanceOf(typeof(IPersistentMap))); IPersistentMap m = o.meta() as IPersistentMap; Expect(m.count(), EqualTo(1)); @@ -1536,16 +1536,16 @@ public void MetaAppliesSymbolAsTagMetaDataToObject() { object o1 = ReadFromString("#^c (a b)"); - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.count(), EqualTo(2)); Expect(s.first(), EqualTo(Symbol.intern("a"))); Expect(s.next().first(), EqualTo(Symbol.intern("b"))); - Expect(o1, InstanceOfType(typeof(IObj))); + Expect(o1, InstanceOf(typeof(IObj))); IObj o = o1 as IObj; - Expect(o.meta(), InstanceOfType(typeof(IPersistentMap))); + Expect(o.meta(), InstanceOf(typeof(IPersistentMap))); IPersistentMap m = o.meta() as IPersistentMap; Expect(m.count(), EqualTo(1)); @@ -1557,16 +1557,16 @@ public void MetaAppliesKeywordAsTagMetaDataToObject() { object o1 = ReadFromString("#^:c (a b)"); - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.count(), EqualTo(2)); Expect(s.first(), EqualTo(Symbol.intern("a"))); Expect(s.next().first(), EqualTo(Symbol.intern("b"))); - Expect(o1, InstanceOfType(typeof(IObj))); + Expect(o1, InstanceOf(typeof(IObj))); IObj o = o1 as IObj; - Expect(o.meta(), InstanceOfType(typeof(IPersistentMap))); + Expect(o.meta(), InstanceOf(typeof(IPersistentMap))); IPersistentMap m = o.meta() as IPersistentMap; Expect(m.count(), EqualTo(1)); @@ -1578,16 +1578,16 @@ public void MetaAppliesStringAsTagMetaDataToObject() { object o1 = ReadFromString("#^\"help\" (a b)"); - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.count(), EqualTo(2)); Expect(s.first(), EqualTo(Symbol.intern("a"))); Expect(s.next().first(), EqualTo(Symbol.intern("b"))); - Expect(o1, InstanceOfType(typeof(IObj))); + Expect(o1, InstanceOf(typeof(IObj))); IObj o = o1 as IObj; - Expect(o.meta(), InstanceOfType(typeof(IPersistentMap))); + Expect(o.meta(), InstanceOf(typeof(IPersistentMap))); IPersistentMap m = o.meta() as IPersistentMap; Expect(m.count(), EqualTo(1)); @@ -1599,16 +1599,16 @@ public void MetaAddsLineupNumberAsMetaDataIfAvailable() { object o1 = ReadFromStringNumbering("\n\n#^:c (a b)"); - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.count(), EqualTo(2)); Expect(s.first(), EqualTo(Symbol.intern("a"))); Expect(s.next().first(), EqualTo(Symbol.intern("b"))); - Expect(o1, InstanceOfType(typeof(IObj))); + Expect(o1, InstanceOf(typeof(IObj))); IObj o = o1 as IObj; - Expect(o.meta(), InstanceOfType(typeof(IPersistentMap))); + Expect(o.meta(), InstanceOf(typeof(IPersistentMap))); IPersistentMap m = o.meta() as IPersistentMap; Expect(m.count(), EqualTo(2)); @@ -1625,7 +1625,7 @@ public void VarWrapsVar() { Object o1 = ReadFromString("#'abc"); - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.count(), EqualTo(2)); Expect(s.first(), EqualTo(Symbol.intern("var"))); @@ -1641,7 +1641,7 @@ public void SharpDoubleQuoteGeneratesRegex() { object o1 = ReadFromString("#\"abc\""); - Expect(o1, InstanceOfType(typeof(System.Text.RegularExpressions.Regex))); + Expect(o1, InstanceOf(typeof(System.Text.RegularExpressions.Regex))); System.Text.RegularExpressions.Regex r = o1 as System.Text.RegularExpressions.Regex; Expect(r.ToString(), EqualTo("abc")); } @@ -1666,7 +1666,7 @@ public void SharpDQEscapesOnBackslash() object o1 = ReadFromString(str); - Expect(o1, InstanceOfType(typeof(System.Text.RegularExpressions.Regex))); + Expect(o1, InstanceOf(typeof(System.Text.RegularExpressions.Regex))); System.Text.RegularExpressions.Regex r = o1 as System.Text.RegularExpressions.Regex; Expect(r.ToString(), EqualTo("a\\\"bc")); } @@ -1681,18 +1681,18 @@ public void SharpFnWithNoArgsGeneratesNoArgFn() object o1 = ReadFromString("#(+ 1 2)"); // (fn* [] (+ 1 2)) - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.first(), EqualTo(Symbol.intern("fn*"))); s = s.next(); - Expect(s.first(), InstanceOfType(typeof(IPersistentVector))); + Expect(s.first(), InstanceOf(typeof(IPersistentVector))); IPersistentVector arglist = s.first() as IPersistentVector; Expect(arglist.count(), EqualTo(0)); s = s.next(); - Expect(s.first(), InstanceOfType(typeof(ISeq))); + Expect(s.first(), InstanceOf(typeof(ISeq))); Expect(s.next(), Null); ISeq form = s.first() as ISeq; @@ -1709,24 +1709,24 @@ public void SharpFnWithArgsGeneratesFnWithArgs() object o1 = ReadFromString("#(+ %2 2)"); // (fn* [p1__N p2__M] (+ p2__M 2)) - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.first(), EqualTo(Symbol.intern("fn*"))); s = s.next(); - Expect(s.first(), InstanceOfType(typeof(IPersistentVector))); + Expect(s.first(), InstanceOf(typeof(IPersistentVector))); IPersistentVector arglist = s.first() as IPersistentVector; Expect(arglist.count(), EqualTo(2)); - Expect(arglist.nth(0), InstanceOfType(typeof(Symbol))); - Expect(arglist.nth(1), InstanceOfType(typeof(Symbol))); + Expect(arglist.nth(0), InstanceOf(typeof(Symbol))); + Expect(arglist.nth(1), InstanceOf(typeof(Symbol))); Symbol arg1 = arglist.nth(0) as Symbol; Symbol arg2 = arglist.nth(1) as Symbol; Expect(arg1.Name, StartsWith("p1__")); Expect(arg2.Name, StartsWith("p2__")); s = s.next(); - Expect(s.first(), InstanceOfType(typeof(ISeq))); + Expect(s.first(), InstanceOf(typeof(ISeq))); Expect(s.next(), Null); ISeq form = s.first() as ISeq; @@ -1743,19 +1743,19 @@ public void SharpFnWithRestArgGeneratesFnWithRestArg() object o1 = ReadFromString("#(+ %2 %&)"); // (fn* [p1__N p2__M & rest__X] (+ p2__M rest__X)) - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.first(), EqualTo(Symbol.intern("fn*"))); s = s.next(); - Expect(s.first(), InstanceOfType(typeof(IPersistentVector))); + Expect(s.first(), InstanceOf(typeof(IPersistentVector))); IPersistentVector arglist = s.first() as IPersistentVector; Expect(arglist.count(), EqualTo(4)); - Expect(arglist.nth(0), InstanceOfType(typeof(Symbol))); - Expect(arglist.nth(1), InstanceOfType(typeof(Symbol))); - Expect(arglist.nth(2), InstanceOfType(typeof(Symbol))); - Expect(arglist.nth(3), InstanceOfType(typeof(Symbol))); + Expect(arglist.nth(0), InstanceOf(typeof(Symbol))); + Expect(arglist.nth(1), InstanceOf(typeof(Symbol))); + Expect(arglist.nth(2), InstanceOf(typeof(Symbol))); + Expect(arglist.nth(3), InstanceOf(typeof(Symbol))); Symbol arg1 = arglist.nth(0) as Symbol; Symbol arg2 = arglist.nth(1) as Symbol; Symbol arg3 = arglist.nth(2) as Symbol; @@ -1766,7 +1766,7 @@ public void SharpFnWithRestArgGeneratesFnWithRestArg() Expect(arg4.Name, StartsWith("rest__")); s = s.next(); - Expect(s.first(), InstanceOfType(typeof(ISeq))); + Expect(s.first(), InstanceOf(typeof(ISeq))); Expect(s.next(), Null); ISeq form = s.first() as ISeq; @@ -1783,21 +1783,21 @@ public void SharpFnWithAnonArgGeneratesFnWithArgs() object o1 = ReadFromString("#(+ % 2)"); // (fn* [p1__N] (+ p1__N 2)) - Expect(o1, InstanceOfType(typeof(ISeq))); + Expect(o1, InstanceOf(typeof(ISeq))); ISeq s = o1 as ISeq; Expect(s.first(), EqualTo(Symbol.intern("fn*"))); s = s.next(); - Expect(s.first(), InstanceOfType(typeof(IPersistentVector))); + Expect(s.first(), InstanceOf(typeof(IPersistentVector))); IPersistentVector arglist = s.first() as IPersistentVector; Expect(arglist.count(), EqualTo(1)); - Expect(arglist.nth(0), InstanceOfType(typeof(Symbol))); + Expect(arglist.nth(0), InstanceOf(typeof(Symbol))); Symbol arg1 = arglist.nth(0) as Symbol; Expect(arg1.Name, StartsWith("p1__")); s = s.next(); - Expect(s.first(), InstanceOfType(typeof(ISeq))); + Expect(s.first(), InstanceOf(typeof(ISeq))); Expect(s.next(), Null); ISeq form = s.first() as ISeq; diff --git a/Clojure/Clojure/CljCompiler/Ast/AssignExpr.cs b/Clojure/Clojure/CljCompiler/Ast/AssignExpr.cs index 6ccb37a48..53cbc0150 100644 --- a/Clojure/Clojure/CljCompiler/Ast/AssignExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/AssignExpr.cs @@ -12,7 +12,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/AssignableExpr.cs b/Clojure/Clojure/CljCompiler/Ast/AssignableExpr.cs index 8f0b095bb..a0dbed214 100644 --- a/Clojure/Clojure/CljCompiler/Ast/AssignableExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/AssignableExpr.cs @@ -12,7 +12,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/BodyExpr.cs b/Clojure/Clojure/CljCompiler/Ast/BodyExpr.cs index f8ca802fa..e7ecd74bf 100644 --- a/Clojure/Clojure/CljCompiler/Ast/BodyExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/BodyExpr.cs @@ -12,7 +12,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/BooleanExpr.cs b/Clojure/Clojure/CljCompiler/Ast/BooleanExpr.cs index b049cfd16..720a17284 100644 --- a/Clojure/Clojure/CljCompiler/Ast/BooleanExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/BooleanExpr.cs @@ -12,7 +12,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/ConstantExpr.cs b/Clojure/Clojure/CljCompiler/Ast/ConstantExpr.cs index ca8780e86..923db7ad2 100644 --- a/Clojure/Clojure/CljCompiler/Ast/ConstantExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/ConstantExpr.cs @@ -12,7 +12,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/DefExpr.cs b/Clojure/Clojure/CljCompiler/Ast/DefExpr.cs index dc69d78ea..d7d4fcbfe 100644 --- a/Clojure/Clojure/CljCompiler/Ast/DefExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/DefExpr.cs @@ -12,7 +12,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/EmptyExpr.cs b/Clojure/Clojure/CljCompiler/Ast/EmptyExpr.cs index f4e19ba3a..be41e2140 100644 --- a/Clojure/Clojure/CljCompiler/Ast/EmptyExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/EmptyExpr.cs @@ -12,7 +12,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/Expr.cs b/Clojure/Clojure/CljCompiler/Ast/Expr.cs index ff85b8f6b..ece2970a9 100644 --- a/Clojure/Clojure/CljCompiler/Ast/Expr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/Expr.cs @@ -12,7 +12,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/FieldExpr.cs b/Clojure/Clojure/CljCompiler/Ast/FieldExpr.cs index bb6ade061..02226b1a9 100644 --- a/Clojure/Clojure/CljCompiler/Ast/FieldExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/FieldExpr.cs @@ -12,7 +12,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/FnExpr.cs b/Clojure/Clojure/CljCompiler/Ast/FnExpr.cs index 0580eef56..5eff23b12 100644 --- a/Clojure/Clojure/CljCompiler/Ast/FnExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/FnExpr.cs @@ -12,7 +12,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif using System.Reflection.Emit; using System.Reflection; using System.Collections; diff --git a/Clojure/Clojure/CljCompiler/Ast/FnMethod.cs b/Clojure/Clojure/CljCompiler/Ast/FnMethod.cs index 57e4789db..90bba19fe 100644 --- a/Clojure/Clojure/CljCompiler/Ast/FnMethod.cs +++ b/Clojure/Clojure/CljCompiler/Ast/FnMethod.cs @@ -14,7 +14,12 @@ using System.Text; using System.Reflection.Emit; using System.Reflection; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/GenContext.cs b/Clojure/Clojure/CljCompiler/Ast/GenContext.cs index 1812a34d3..6361b6901 100644 --- a/Clojure/Clojure/CljCompiler/Ast/GenContext.cs +++ b/Clojure/Clojure/CljCompiler/Ast/GenContext.cs @@ -14,7 +14,12 @@ using System.Text; using System.Reflection.Emit; using System.Reflection; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/HostExpr.cs b/Clojure/Clojure/CljCompiler/Ast/HostExpr.cs index 4e7a2c004..875d40ded 100644 --- a/Clojure/Clojure/CljCompiler/Ast/HostExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/HostExpr.cs @@ -13,7 +13,12 @@ using System.Linq; using System.Text; using System.Reflection; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + using clojure.runtime; using System.IO; diff --git a/Clojure/Clojure/CljCompiler/Ast/IfExpr.cs b/Clojure/Clojure/CljCompiler/Ast/IfExpr.cs index f8b6d5770..82526d519 100644 --- a/Clojure/Clojure/CljCompiler/Ast/IfExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/IfExpr.cs @@ -12,7 +12,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + using clojure.runtime; namespace clojure.lang.CljCompiler.Ast diff --git a/Clojure/Clojure/CljCompiler/Ast/ImportExpr.cs b/Clojure/Clojure/CljCompiler/Ast/ImportExpr.cs index 757caa3b5..e81d58080 100644 --- a/Clojure/Clojure/CljCompiler/Ast/ImportExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/ImportExpr.cs @@ -12,7 +12,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/InstanceFieldExpr.cs b/Clojure/Clojure/CljCompiler/Ast/InstanceFieldExpr.cs index 69cf531ed..ce011ff01 100644 --- a/Clojure/Clojure/CljCompiler/Ast/InstanceFieldExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/InstanceFieldExpr.cs @@ -14,7 +14,12 @@ using System.Text; using System.Reflection; using System.IO; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/InstanceMethodExpr.cs b/Clojure/Clojure/CljCompiler/Ast/InstanceMethodExpr.cs index 7945ed10e..1b42138ea 100644 --- a/Clojure/Clojure/CljCompiler/Ast/InstanceMethodExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/InstanceMethodExpr.cs @@ -13,7 +13,11 @@ using System.Linq; using System.Text; using System.Reflection; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif using AstUtils = Microsoft.Scripting.Ast.Utils; namespace clojure.lang.CljCompiler.Ast diff --git a/Clojure/Clojure/CljCompiler/Ast/InvokeExpr.cs b/Clojure/Clojure/CljCompiler/Ast/InvokeExpr.cs index f1025849a..1804446f9 100644 --- a/Clojure/Clojure/CljCompiler/Ast/InvokeExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/InvokeExpr.cs @@ -12,7 +12,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + using System.Reflection; namespace clojure.lang.CljCompiler.Ast diff --git a/Clojure/Clojure/CljCompiler/Ast/KeywordExpr.cs b/Clojure/Clojure/CljCompiler/Ast/KeywordExpr.cs index 729f25bc4..a55a5d034 100644 --- a/Clojure/Clojure/CljCompiler/Ast/KeywordExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/KeywordExpr.cs @@ -12,7 +12,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/LetExpr.cs b/Clojure/Clojure/CljCompiler/Ast/LetExpr.cs index 886ed3c6e..1e5b761b4 100644 --- a/Clojure/Clojure/CljCompiler/Ast/LetExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/LetExpr.cs @@ -12,7 +12,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/LetFnExpr.cs b/Clojure/Clojure/CljCompiler/Ast/LetFnExpr.cs index 1217354ed..13d2edc23 100644 --- a/Clojure/Clojure/CljCompiler/Ast/LetFnExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/LetFnExpr.cs @@ -12,7 +12,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/LiteralExpr.cs b/Clojure/Clojure/CljCompiler/Ast/LiteralExpr.cs index dd4a43fcf..62fe0332f 100644 --- a/Clojure/Clojure/CljCompiler/Ast/LiteralExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/LiteralExpr.cs @@ -12,7 +12,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/LocalBinding.cs b/Clojure/Clojure/CljCompiler/Ast/LocalBinding.cs index 1d1cd8664..f09be8124 100644 --- a/Clojure/Clojure/CljCompiler/Ast/LocalBinding.cs +++ b/Clojure/Clojure/CljCompiler/Ast/LocalBinding.cs @@ -12,7 +12,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/LocalBindingExpr.cs b/Clojure/Clojure/CljCompiler/Ast/LocalBindingExpr.cs index cdee3342c..3ac8f6b6d 100644 --- a/Clojure/Clojure/CljCompiler/Ast/LocalBindingExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/LocalBindingExpr.cs @@ -12,7 +12,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/MapExpr.cs b/Clojure/Clojure/CljCompiler/Ast/MapExpr.cs index bb970c035..e44db73bb 100644 --- a/Clojure/Clojure/CljCompiler/Ast/MapExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/MapExpr.cs @@ -12,7 +12,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/MaybePrimitiveExpr.cs b/Clojure/Clojure/CljCompiler/Ast/MaybePrimitiveExpr.cs index 904f78bfd..684364f61 100644 --- a/Clojure/Clojure/CljCompiler/Ast/MaybePrimitiveExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/MaybePrimitiveExpr.cs @@ -12,7 +12,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/MetaExpr.cs b/Clojure/Clojure/CljCompiler/Ast/MetaExpr.cs index cc8188c10..e7722c2d3 100644 --- a/Clojure/Clojure/CljCompiler/Ast/MetaExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/MetaExpr.cs @@ -12,7 +12,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/MonitorEnterExpr.cs b/Clojure/Clojure/CljCompiler/Ast/MonitorEnterExpr.cs index d90100179..89da87fcd 100644 --- a/Clojure/Clojure/CljCompiler/Ast/MonitorEnterExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/MonitorEnterExpr.cs @@ -12,7 +12,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/MonitorExitExpr.cs b/Clojure/Clojure/CljCompiler/Ast/MonitorExitExpr.cs index 57b49e6ea..18d877d6f 100644 --- a/Clojure/Clojure/CljCompiler/Ast/MonitorExitExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/MonitorExitExpr.cs @@ -12,7 +12,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/NewExpr.cs b/Clojure/Clojure/CljCompiler/Ast/NewExpr.cs index 86ce80920..23ced3fda 100644 --- a/Clojure/Clojure/CljCompiler/Ast/NewExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/NewExpr.cs @@ -13,7 +13,12 @@ using System.Linq; using System.Text; using System.Reflection; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + using System.IO; namespace clojure.lang.CljCompiler.Ast diff --git a/Clojure/Clojure/CljCompiler/Ast/NilExpr.cs b/Clojure/Clojure/CljCompiler/Ast/NilExpr.cs index b3bc1c660..ed2348464 100644 --- a/Clojure/Clojure/CljCompiler/Ast/NilExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/NilExpr.cs @@ -12,7 +12,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/RecurExpr.cs b/Clojure/Clojure/CljCompiler/Ast/RecurExpr.cs index 3033f169e..221408cea 100644 --- a/Clojure/Clojure/CljCompiler/Ast/RecurExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/RecurExpr.cs @@ -12,7 +12,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/SetExpr.cs b/Clojure/Clojure/CljCompiler/Ast/SetExpr.cs index c3c7b3b42..3b78a39e4 100644 --- a/Clojure/Clojure/CljCompiler/Ast/SetExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/SetExpr.cs @@ -12,7 +12,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/StaticFieldExpr.cs b/Clojure/Clojure/CljCompiler/Ast/StaticFieldExpr.cs index a267e0d2c..f5bdc5b1e 100644 --- a/Clojure/Clojure/CljCompiler/Ast/StaticFieldExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/StaticFieldExpr.cs @@ -13,7 +13,11 @@ using System.Linq; using System.Text; using System.Reflection; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif using System.IO; namespace clojure.lang.CljCompiler.Ast diff --git a/Clojure/Clojure/CljCompiler/Ast/StaticMethodExpr.cs b/Clojure/Clojure/CljCompiler/Ast/StaticMethodExpr.cs index f57f3ecfd..069720a0e 100644 --- a/Clojure/Clojure/CljCompiler/Ast/StaticMethodExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/StaticMethodExpr.cs @@ -13,8 +13,13 @@ using System.Linq; using System.Text; using System.Reflection; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif using AstUtils = Microsoft.Scripting.Ast.Utils; + using System.IO; namespace clojure.lang.CljCompiler.Ast diff --git a/Clojure/Clojure/CljCompiler/Ast/StringExpr.cs b/Clojure/Clojure/CljCompiler/Ast/StringExpr.cs index 53f0445b8..18908f40d 100644 --- a/Clojure/Clojure/CljCompiler/Ast/StringExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/StringExpr.cs @@ -12,7 +12,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/TheVarExpr.cs b/Clojure/Clojure/CljCompiler/Ast/TheVarExpr.cs index 0862dc26a..50d01237b 100644 --- a/Clojure/Clojure/CljCompiler/Ast/TheVarExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/TheVarExpr.cs @@ -12,7 +12,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/ThrowExpr.cs b/Clojure/Clojure/CljCompiler/Ast/ThrowExpr.cs index c475f4130..352ea31fd 100644 --- a/Clojure/Clojure/CljCompiler/Ast/ThrowExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/ThrowExpr.cs @@ -12,7 +12,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/TryExpr.cs b/Clojure/Clojure/CljCompiler/Ast/TryExpr.cs index 85debb383..cf3ee1d16 100644 --- a/Clojure/Clojure/CljCompiler/Ast/TryExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/TryExpr.cs @@ -12,7 +12,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/UnresolvedVarExpr.cs b/Clojure/Clojure/CljCompiler/Ast/UnresolvedVarExpr.cs index 5f8546041..eaac7c982 100644 --- a/Clojure/Clojure/CljCompiler/Ast/UnresolvedVarExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/UnresolvedVarExpr.cs @@ -12,7 +12,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/VarExpr.cs b/Clojure/Clojure/CljCompiler/Ast/VarExpr.cs index b342c1b30..444cb8361 100644 --- a/Clojure/Clojure/CljCompiler/Ast/VarExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/VarExpr.cs @@ -12,7 +12,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Ast/VectorExpr.cs b/Clojure/Clojure/CljCompiler/Ast/VectorExpr.cs index b3b9348a8..3b76a0c9d 100644 --- a/Clojure/Clojure/CljCompiler/Ast/VectorExpr.cs +++ b/Clojure/Clojure/CljCompiler/Ast/VectorExpr.cs @@ -12,7 +12,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + namespace clojure.lang.CljCompiler.Ast { diff --git a/Clojure/Clojure/CljCompiler/Compiler.cs b/Clojure/Clojure/CljCompiler/Compiler.cs index f7251aae9..429a245e4 100644 --- a/Clojure/Clojure/CljCompiler/Compiler.cs +++ b/Clojure/Clojure/CljCompiler/Compiler.cs @@ -14,7 +14,11 @@ using System.Text; using System.IO; using System.Threading; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif using clojure.lang.CljCompiler.Ast; using clojure.runtime; using System.Reflection; diff --git a/Clojure/Clojure/CljCompiler/GenDelegate.cs b/Clojure/Clojure/CljCompiler/GenDelegate.cs index 4ed1de78e..7254925de 100644 --- a/Clojure/Clojure/CljCompiler/GenDelegate.cs +++ b/Clojure/Clojure/CljCompiler/GenDelegate.cs @@ -1,9 +1,24 @@ -using System; +/** + * Copyright (c) David Miller. All rights reserved. + * The use and distribution terms for this software are covered by the + * Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php) + * which can be found in the file epl-v10.html at the root of this distribution. + * By using this software in any fashion, you are agreeing to be bound by + * the terms of this license. + * You must not remove this notice, or any other, from this software. + **/ + +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Reflection; -using Microsoft.Linq.Expressions; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif + using clojure.lang.CljCompiler.Ast; diff --git a/Clojure/Clojure/Clojure.csproj b/Clojure/Clojure/Clojure.csproj index fbfd8b3be..18c513c9b 100644 --- a/Clojure/Clojure/Clojure.csproj +++ b/Clojure/Clojure/Clojure.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 9.0.30729 + 9.0.21022 2.0 {B8089F66-DFBD-4906-BEE0-B317689C2524} Library @@ -20,7 +20,7 @@ full false bin\Debug\ - DEBUG;TRACE + TRACE;DEBUG;CLR2 prompt 4 @@ -231,6 +231,10 @@ + + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3} + Microsoft.Dynamic + {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4} Microsoft.Scripting.Core diff --git a/Clojure/ClojureCLR.sln b/Clojure/ClojureCLR.sln index 85a0051e8..a55c500c5 100644 --- a/Clojure/ClojureCLR.sln +++ b/Clojure/ClojureCLR.sln @@ -17,10 +17,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Runtime", "Runtime", "{491B EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Scripting.Core", "..\..\DLR_Main\Src\Runtime\Microsoft.Scripting.Core\Microsoft.Scripting.Core.csproj", "{2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Scripting", "..\..\DLR_Main\Src\Runtime\Microsoft.Scripting\Microsoft.Scripting.csproj", "{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Scripting", "..\..\DLR_Main\Src\Runtime\Microsoft.Scripting\Microsoft.Scripting.csproj", "{02FF0909-F5AD-48CF-A86A-345E721B7E40}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Scripting.ExtensionAttribute", "..\..\DLR_Main\Src\Runtime\Microsoft.Scripting.Core\Microsoft.Scripting.ExtensionAttribute.csproj", "{8B0F1074-750E-4D64-BF23-A1E0F54261E5}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Dynamic", "..\..\DLR_Main\Src\Runtime\Microsoft.Dynamic\Microsoft.Dynamic.csproj", "{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -28,9 +30,13 @@ Global DelaySigned Silverlight Release|Any CPU = DelaySigned Silverlight Release|Any CPU FxCop|Any CPU = FxCop|Any CPU Release|Any CPU = Release|Any CPU + Silverlight 4 Debug|Any CPU = Silverlight 4 Debug|Any CPU + Silverlight 4 Release|Any CPU = Silverlight 4 Release|Any CPU Silverlight Debug|Any CPU = Silverlight Debug|Any CPU Silverlight Release|Any CPU = Silverlight Release|Any CPU SpecSharp|Any CPU = SpecSharp|Any CPU + V4 Debug|Any CPU = V4 Debug|Any CPU + V4 Release|Any CPU = V4 Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B8089F66-DFBD-4906-BEE0-B317689C2524}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -43,12 +49,20 @@ Global {B8089F66-DFBD-4906-BEE0-B317689C2524}.FxCop|Any CPU.Build.0 = Release|Any CPU {B8089F66-DFBD-4906-BEE0-B317689C2524}.Release|Any CPU.ActiveCfg = Release|Any CPU {B8089F66-DFBD-4906-BEE0-B317689C2524}.Release|Any CPU.Build.0 = Release|Any CPU + {B8089F66-DFBD-4906-BEE0-B317689C2524}.Silverlight 4 Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B8089F66-DFBD-4906-BEE0-B317689C2524}.Silverlight 4 Debug|Any CPU.Build.0 = Debug|Any CPU + {B8089F66-DFBD-4906-BEE0-B317689C2524}.Silverlight 4 Release|Any CPU.ActiveCfg = Release|Any CPU + {B8089F66-DFBD-4906-BEE0-B317689C2524}.Silverlight 4 Release|Any CPU.Build.0 = Release|Any CPU {B8089F66-DFBD-4906-BEE0-B317689C2524}.Silverlight Debug|Any CPU.ActiveCfg = Debug|Any CPU {B8089F66-DFBD-4906-BEE0-B317689C2524}.Silverlight Debug|Any CPU.Build.0 = Debug|Any CPU {B8089F66-DFBD-4906-BEE0-B317689C2524}.Silverlight Release|Any CPU.ActiveCfg = Release|Any CPU {B8089F66-DFBD-4906-BEE0-B317689C2524}.Silverlight Release|Any CPU.Build.0 = Release|Any CPU {B8089F66-DFBD-4906-BEE0-B317689C2524}.SpecSharp|Any CPU.ActiveCfg = Release|Any CPU {B8089F66-DFBD-4906-BEE0-B317689C2524}.SpecSharp|Any CPU.Build.0 = Release|Any CPU + {B8089F66-DFBD-4906-BEE0-B317689C2524}.V4 Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B8089F66-DFBD-4906-BEE0-B317689C2524}.V4 Debug|Any CPU.Build.0 = Debug|Any CPU + {B8089F66-DFBD-4906-BEE0-B317689C2524}.V4 Release|Any CPU.ActiveCfg = Release|Any CPU + {B8089F66-DFBD-4906-BEE0-B317689C2524}.V4 Release|Any CPU.Build.0 = Release|Any CPU {656E1517-B0CA-47B4-B068-3DF43DC41F8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {656E1517-B0CA-47B4-B068-3DF43DC41F8A}.Debug|Any CPU.Build.0 = Debug|Any CPU {656E1517-B0CA-47B4-B068-3DF43DC41F8A}.DelaySigned Release|Any CPU.ActiveCfg = Release|Any CPU @@ -59,12 +73,20 @@ Global {656E1517-B0CA-47B4-B068-3DF43DC41F8A}.FxCop|Any CPU.Build.0 = Release|Any CPU {656E1517-B0CA-47B4-B068-3DF43DC41F8A}.Release|Any CPU.ActiveCfg = Release|Any CPU {656E1517-B0CA-47B4-B068-3DF43DC41F8A}.Release|Any CPU.Build.0 = Release|Any CPU + {656E1517-B0CA-47B4-B068-3DF43DC41F8A}.Silverlight 4 Debug|Any CPU.ActiveCfg = Debug|Any CPU + {656E1517-B0CA-47B4-B068-3DF43DC41F8A}.Silverlight 4 Debug|Any CPU.Build.0 = Debug|Any CPU + {656E1517-B0CA-47B4-B068-3DF43DC41F8A}.Silverlight 4 Release|Any CPU.ActiveCfg = Release|Any CPU + {656E1517-B0CA-47B4-B068-3DF43DC41F8A}.Silverlight 4 Release|Any CPU.Build.0 = Release|Any CPU {656E1517-B0CA-47B4-B068-3DF43DC41F8A}.Silverlight Debug|Any CPU.ActiveCfg = Debug|Any CPU {656E1517-B0CA-47B4-B068-3DF43DC41F8A}.Silverlight Debug|Any CPU.Build.0 = Debug|Any CPU {656E1517-B0CA-47B4-B068-3DF43DC41F8A}.Silverlight Release|Any CPU.ActiveCfg = Release|Any CPU {656E1517-B0CA-47B4-B068-3DF43DC41F8A}.Silverlight Release|Any CPU.Build.0 = Release|Any CPU {656E1517-B0CA-47B4-B068-3DF43DC41F8A}.SpecSharp|Any CPU.ActiveCfg = Release|Any CPU {656E1517-B0CA-47B4-B068-3DF43DC41F8A}.SpecSharp|Any CPU.Build.0 = Release|Any CPU + {656E1517-B0CA-47B4-B068-3DF43DC41F8A}.V4 Debug|Any CPU.ActiveCfg = Debug|Any CPU + {656E1517-B0CA-47B4-B068-3DF43DC41F8A}.V4 Debug|Any CPU.Build.0 = Debug|Any CPU + {656E1517-B0CA-47B4-B068-3DF43DC41F8A}.V4 Release|Any CPU.ActiveCfg = Release|Any CPU + {656E1517-B0CA-47B4-B068-3DF43DC41F8A}.V4 Release|Any CPU.Build.0 = Release|Any CPU {B57B71C6-A952-41A1-ABF1-9B9BACDD12ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B57B71C6-A952-41A1-ABF1-9B9BACDD12ED}.Debug|Any CPU.Build.0 = Debug|Any CPU {B57B71C6-A952-41A1-ABF1-9B9BACDD12ED}.DelaySigned Release|Any CPU.ActiveCfg = Release|Any CPU @@ -75,12 +97,20 @@ Global {B57B71C6-A952-41A1-ABF1-9B9BACDD12ED}.FxCop|Any CPU.Build.0 = Release|Any CPU {B57B71C6-A952-41A1-ABF1-9B9BACDD12ED}.Release|Any CPU.ActiveCfg = Release|Any CPU {B57B71C6-A952-41A1-ABF1-9B9BACDD12ED}.Release|Any CPU.Build.0 = Release|Any CPU + {B57B71C6-A952-41A1-ABF1-9B9BACDD12ED}.Silverlight 4 Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B57B71C6-A952-41A1-ABF1-9B9BACDD12ED}.Silverlight 4 Debug|Any CPU.Build.0 = Debug|Any CPU + {B57B71C6-A952-41A1-ABF1-9B9BACDD12ED}.Silverlight 4 Release|Any CPU.ActiveCfg = Release|Any CPU + {B57B71C6-A952-41A1-ABF1-9B9BACDD12ED}.Silverlight 4 Release|Any CPU.Build.0 = Release|Any CPU {B57B71C6-A952-41A1-ABF1-9B9BACDD12ED}.Silverlight Debug|Any CPU.ActiveCfg = Debug|Any CPU {B57B71C6-A952-41A1-ABF1-9B9BACDD12ED}.Silverlight Debug|Any CPU.Build.0 = Debug|Any CPU {B57B71C6-A952-41A1-ABF1-9B9BACDD12ED}.Silverlight Release|Any CPU.ActiveCfg = Release|Any CPU {B57B71C6-A952-41A1-ABF1-9B9BACDD12ED}.Silverlight Release|Any CPU.Build.0 = Release|Any CPU {B57B71C6-A952-41A1-ABF1-9B9BACDD12ED}.SpecSharp|Any CPU.ActiveCfg = Release|Any CPU {B57B71C6-A952-41A1-ABF1-9B9BACDD12ED}.SpecSharp|Any CPU.Build.0 = Release|Any CPU + {B57B71C6-A952-41A1-ABF1-9B9BACDD12ED}.V4 Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B57B71C6-A952-41A1-ABF1-9B9BACDD12ED}.V4 Debug|Any CPU.Build.0 = Debug|Any CPU + {B57B71C6-A952-41A1-ABF1-9B9BACDD12ED}.V4 Release|Any CPU.ActiveCfg = Release|Any CPU + {B57B71C6-A952-41A1-ABF1-9B9BACDD12ED}.V4 Release|Any CPU.Build.0 = Release|Any CPU {A9B3BA9E-6955-43E6-9846-54DEFEDCFBFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A9B3BA9E-6955-43E6-9846-54DEFEDCFBFC}.Debug|Any CPU.Build.0 = Debug|Any CPU {A9B3BA9E-6955-43E6-9846-54DEFEDCFBFC}.DelaySigned Release|Any CPU.ActiveCfg = Release|Any CPU @@ -91,12 +121,20 @@ Global {A9B3BA9E-6955-43E6-9846-54DEFEDCFBFC}.FxCop|Any CPU.Build.0 = Release|Any CPU {A9B3BA9E-6955-43E6-9846-54DEFEDCFBFC}.Release|Any CPU.ActiveCfg = Release|Any CPU {A9B3BA9E-6955-43E6-9846-54DEFEDCFBFC}.Release|Any CPU.Build.0 = Release|Any CPU + {A9B3BA9E-6955-43E6-9846-54DEFEDCFBFC}.Silverlight 4 Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A9B3BA9E-6955-43E6-9846-54DEFEDCFBFC}.Silverlight 4 Debug|Any CPU.Build.0 = Debug|Any CPU + {A9B3BA9E-6955-43E6-9846-54DEFEDCFBFC}.Silverlight 4 Release|Any CPU.ActiveCfg = Release|Any CPU + {A9B3BA9E-6955-43E6-9846-54DEFEDCFBFC}.Silverlight 4 Release|Any CPU.Build.0 = Release|Any CPU {A9B3BA9E-6955-43E6-9846-54DEFEDCFBFC}.Silverlight Debug|Any CPU.ActiveCfg = Debug|Any CPU {A9B3BA9E-6955-43E6-9846-54DEFEDCFBFC}.Silverlight Debug|Any CPU.Build.0 = Debug|Any CPU {A9B3BA9E-6955-43E6-9846-54DEFEDCFBFC}.Silverlight Release|Any CPU.ActiveCfg = Release|Any CPU {A9B3BA9E-6955-43E6-9846-54DEFEDCFBFC}.Silverlight Release|Any CPU.Build.0 = Release|Any CPU {A9B3BA9E-6955-43E6-9846-54DEFEDCFBFC}.SpecSharp|Any CPU.ActiveCfg = Release|Any CPU {A9B3BA9E-6955-43E6-9846-54DEFEDCFBFC}.SpecSharp|Any CPU.Build.0 = Release|Any CPU + {A9B3BA9E-6955-43E6-9846-54DEFEDCFBFC}.V4 Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A9B3BA9E-6955-43E6-9846-54DEFEDCFBFC}.V4 Debug|Any CPU.Build.0 = Debug|Any CPU + {A9B3BA9E-6955-43E6-9846-54DEFEDCFBFC}.V4 Release|Any CPU.ActiveCfg = Release|Any CPU + {A9B3BA9E-6955-43E6-9846-54DEFEDCFBFC}.V4 Release|Any CPU.Build.0 = Release|Any CPU {0A74E77B-8BFF-4A64-8A16-5D0E5C9C47F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0A74E77B-8BFF-4A64-8A16-5D0E5C9C47F3}.Debug|Any CPU.Build.0 = Debug|Any CPU {0A74E77B-8BFF-4A64-8A16-5D0E5C9C47F3}.DelaySigned Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,12 +145,20 @@ Global {0A74E77B-8BFF-4A64-8A16-5D0E5C9C47F3}.FxCop|Any CPU.Build.0 = Release|Any CPU {0A74E77B-8BFF-4A64-8A16-5D0E5C9C47F3}.Release|Any CPU.ActiveCfg = Release|Any CPU {0A74E77B-8BFF-4A64-8A16-5D0E5C9C47F3}.Release|Any CPU.Build.0 = Release|Any CPU + {0A74E77B-8BFF-4A64-8A16-5D0E5C9C47F3}.Silverlight 4 Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0A74E77B-8BFF-4A64-8A16-5D0E5C9C47F3}.Silverlight 4 Debug|Any CPU.Build.0 = Debug|Any CPU + {0A74E77B-8BFF-4A64-8A16-5D0E5C9C47F3}.Silverlight 4 Release|Any CPU.ActiveCfg = Release|Any CPU + {0A74E77B-8BFF-4A64-8A16-5D0E5C9C47F3}.Silverlight 4 Release|Any CPU.Build.0 = Release|Any CPU {0A74E77B-8BFF-4A64-8A16-5D0E5C9C47F3}.Silverlight Debug|Any CPU.ActiveCfg = Debug|Any CPU {0A74E77B-8BFF-4A64-8A16-5D0E5C9C47F3}.Silverlight Debug|Any CPU.Build.0 = Debug|Any CPU {0A74E77B-8BFF-4A64-8A16-5D0E5C9C47F3}.Silverlight Release|Any CPU.ActiveCfg = Release|Any CPU {0A74E77B-8BFF-4A64-8A16-5D0E5C9C47F3}.Silverlight Release|Any CPU.Build.0 = Release|Any CPU {0A74E77B-8BFF-4A64-8A16-5D0E5C9C47F3}.SpecSharp|Any CPU.ActiveCfg = Release|Any CPU {0A74E77B-8BFF-4A64-8A16-5D0E5C9C47F3}.SpecSharp|Any CPU.Build.0 = Release|Any CPU + {0A74E77B-8BFF-4A64-8A16-5D0E5C9C47F3}.V4 Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0A74E77B-8BFF-4A64-8A16-5D0E5C9C47F3}.V4 Debug|Any CPU.Build.0 = Debug|Any CPU + {0A74E77B-8BFF-4A64-8A16-5D0E5C9C47F3}.V4 Release|Any CPU.ActiveCfg = Release|Any CPU + {0A74E77B-8BFF-4A64-8A16-5D0E5C9C47F3}.V4 Release|Any CPU.Build.0 = Release|Any CPU {3DBF3359-43B5-47C9-9E4D-CF50D7587F20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3DBF3359-43B5-47C9-9E4D-CF50D7587F20}.Debug|Any CPU.Build.0 = Debug|Any CPU {3DBF3359-43B5-47C9-9E4D-CF50D7587F20}.DelaySigned Release|Any CPU.ActiveCfg = Release|Any CPU @@ -123,12 +169,20 @@ Global {3DBF3359-43B5-47C9-9E4D-CF50D7587F20}.FxCop|Any CPU.Build.0 = Release|Any CPU {3DBF3359-43B5-47C9-9E4D-CF50D7587F20}.Release|Any CPU.ActiveCfg = Release|Any CPU {3DBF3359-43B5-47C9-9E4D-CF50D7587F20}.Release|Any CPU.Build.0 = Release|Any CPU + {3DBF3359-43B5-47C9-9E4D-CF50D7587F20}.Silverlight 4 Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3DBF3359-43B5-47C9-9E4D-CF50D7587F20}.Silverlight 4 Debug|Any CPU.Build.0 = Debug|Any CPU + {3DBF3359-43B5-47C9-9E4D-CF50D7587F20}.Silverlight 4 Release|Any CPU.ActiveCfg = Release|Any CPU + {3DBF3359-43B5-47C9-9E4D-CF50D7587F20}.Silverlight 4 Release|Any CPU.Build.0 = Release|Any CPU {3DBF3359-43B5-47C9-9E4D-CF50D7587F20}.Silverlight Debug|Any CPU.ActiveCfg = Debug|Any CPU {3DBF3359-43B5-47C9-9E4D-CF50D7587F20}.Silverlight Debug|Any CPU.Build.0 = Debug|Any CPU {3DBF3359-43B5-47C9-9E4D-CF50D7587F20}.Silverlight Release|Any CPU.ActiveCfg = Release|Any CPU {3DBF3359-43B5-47C9-9E4D-CF50D7587F20}.Silverlight Release|Any CPU.Build.0 = Release|Any CPU {3DBF3359-43B5-47C9-9E4D-CF50D7587F20}.SpecSharp|Any CPU.ActiveCfg = Release|Any CPU {3DBF3359-43B5-47C9-9E4D-CF50D7587F20}.SpecSharp|Any CPU.Build.0 = Release|Any CPU + {3DBF3359-43B5-47C9-9E4D-CF50D7587F20}.V4 Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3DBF3359-43B5-47C9-9E4D-CF50D7587F20}.V4 Debug|Any CPU.Build.0 = Debug|Any CPU + {3DBF3359-43B5-47C9-9E4D-CF50D7587F20}.V4 Release|Any CPU.ActiveCfg = Release|Any CPU + {3DBF3359-43B5-47C9-9E4D-CF50D7587F20}.V4 Release|Any CPU.Build.0 = Release|Any CPU {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.Debug|Any CPU.Build.0 = Debug|Any CPU {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.DelaySigned Release|Any CPU.ActiveCfg = Release|Any CPU @@ -139,28 +193,44 @@ Global {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.FxCop|Any CPU.Build.0 = FxCop|Any CPU {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.Release|Any CPU.ActiveCfg = Release|Any CPU {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.Release|Any CPU.Build.0 = Release|Any CPU + {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.Silverlight 4 Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.Silverlight 4 Debug|Any CPU.Build.0 = Debug|Any CPU + {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.Silverlight 4 Release|Any CPU.ActiveCfg = Release|Any CPU + {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.Silverlight 4 Release|Any CPU.Build.0 = Release|Any CPU {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.Silverlight Debug|Any CPU.ActiveCfg = Silverlight Debug|Any CPU {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.Silverlight Debug|Any CPU.Build.0 = Silverlight Debug|Any CPU {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.Silverlight Release|Any CPU.ActiveCfg = Silverlight Release|Any CPU {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.Silverlight Release|Any CPU.Build.0 = Silverlight Release|Any CPU {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.SpecSharp|Any CPU.ActiveCfg = Silverlight Release|Any CPU {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.SpecSharp|Any CPU.Build.0 = Silverlight Release|Any CPU - {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.DelaySigned Release|Any CPU.ActiveCfg = Release|Any CPU - {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.DelaySigned Release|Any CPU.Build.0 = Release|Any CPU - {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.DelaySigned Silverlight Release|Any CPU.ActiveCfg = Silverlight Release|Any CPU - {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.DelaySigned Silverlight Release|Any CPU.Build.0 = Silverlight Release|Any CPU - {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.FxCop|Any CPU.ActiveCfg = FxCop|Any CPU - {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.FxCop|Any CPU.Build.0 = FxCop|Any CPU - {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Release|Any CPU.Build.0 = Release|Any CPU - {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Silverlight Debug|Any CPU.ActiveCfg = Silverlight Debug|Any CPU - {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Silverlight Debug|Any CPU.Build.0 = Silverlight Debug|Any CPU - {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Silverlight Release|Any CPU.ActiveCfg = Silverlight Release|Any CPU - {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Silverlight Release|Any CPU.Build.0 = Silverlight Release|Any CPU - {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.SpecSharp|Any CPU.ActiveCfg = Silverlight Release|Any CPU - {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.SpecSharp|Any CPU.Build.0 = Silverlight Release|Any CPU + {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.V4 Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.V4 Debug|Any CPU.Build.0 = Debug|Any CPU + {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.V4 Release|Any CPU.ActiveCfg = Release|Any CPU + {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.V4 Release|Any CPU.Build.0 = Release|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.Debug|Any CPU.Build.0 = Debug|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.DelaySigned Release|Any CPU.ActiveCfg = Release|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.DelaySigned Release|Any CPU.Build.0 = Release|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.DelaySigned Silverlight Release|Any CPU.ActiveCfg = Silverlight Release|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.DelaySigned Silverlight Release|Any CPU.Build.0 = Silverlight Release|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.FxCop|Any CPU.ActiveCfg = FxCop|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.FxCop|Any CPU.Build.0 = FxCop|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.Release|Any CPU.ActiveCfg = Release|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.Release|Any CPU.Build.0 = Release|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.Silverlight 4 Debug|Any CPU.ActiveCfg = Silverlight 4 Debug|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.Silverlight 4 Debug|Any CPU.Build.0 = Silverlight 4 Debug|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.Silverlight 4 Release|Any CPU.ActiveCfg = Silverlight 4 Release|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.Silverlight 4 Release|Any CPU.Build.0 = Silverlight 4 Release|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.Silverlight Debug|Any CPU.ActiveCfg = Silverlight Debug|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.Silverlight Debug|Any CPU.Build.0 = Silverlight Debug|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.Silverlight Release|Any CPU.ActiveCfg = Silverlight Release|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.Silverlight Release|Any CPU.Build.0 = Silverlight Release|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.SpecSharp|Any CPU.ActiveCfg = Silverlight Release|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.SpecSharp|Any CPU.Build.0 = Silverlight Release|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.V4 Debug|Any CPU.ActiveCfg = V4 Debug|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.V4 Debug|Any CPU.Build.0 = V4 Debug|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.V4 Release|Any CPU.ActiveCfg = V4 Release|Any CPU + {02FF0909-F5AD-48CF-A86A-345E721B7E40}.V4 Release|Any CPU.Build.0 = V4 Release|Any CPU {8B0F1074-750E-4D64-BF23-A1E0F54261E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8B0F1074-750E-4D64-BF23-A1E0F54261E5}.Debug|Any CPU.Build.0 = Debug|Any CPU {8B0F1074-750E-4D64-BF23-A1E0F54261E5}.DelaySigned Release|Any CPU.ActiveCfg = Release|Any CPU @@ -171,19 +241,52 @@ Global {8B0F1074-750E-4D64-BF23-A1E0F54261E5}.FxCop|Any CPU.Build.0 = FxCop|Any CPU {8B0F1074-750E-4D64-BF23-A1E0F54261E5}.Release|Any CPU.ActiveCfg = Release|Any CPU {8B0F1074-750E-4D64-BF23-A1E0F54261E5}.Release|Any CPU.Build.0 = Release|Any CPU + {8B0F1074-750E-4D64-BF23-A1E0F54261E5}.Silverlight 4 Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8B0F1074-750E-4D64-BF23-A1E0F54261E5}.Silverlight 4 Debug|Any CPU.Build.0 = Debug|Any CPU + {8B0F1074-750E-4D64-BF23-A1E0F54261E5}.Silverlight 4 Release|Any CPU.ActiveCfg = Release|Any CPU + {8B0F1074-750E-4D64-BF23-A1E0F54261E5}.Silverlight 4 Release|Any CPU.Build.0 = Release|Any CPU {8B0F1074-750E-4D64-BF23-A1E0F54261E5}.Silverlight Debug|Any CPU.ActiveCfg = Silverlight Debug|Any CPU {8B0F1074-750E-4D64-BF23-A1E0F54261E5}.Silverlight Debug|Any CPU.Build.0 = Silverlight Debug|Any CPU {8B0F1074-750E-4D64-BF23-A1E0F54261E5}.Silverlight Release|Any CPU.ActiveCfg = Silverlight Release|Any CPU {8B0F1074-750E-4D64-BF23-A1E0F54261E5}.Silverlight Release|Any CPU.Build.0 = Silverlight Release|Any CPU {8B0F1074-750E-4D64-BF23-A1E0F54261E5}.SpecSharp|Any CPU.ActiveCfg = Silverlight Release|Any CPU {8B0F1074-750E-4D64-BF23-A1E0F54261E5}.SpecSharp|Any CPU.Build.0 = Silverlight Release|Any CPU + {8B0F1074-750E-4D64-BF23-A1E0F54261E5}.V4 Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8B0F1074-750E-4D64-BF23-A1E0F54261E5}.V4 Debug|Any CPU.Build.0 = Debug|Any CPU + {8B0F1074-750E-4D64-BF23-A1E0F54261E5}.V4 Release|Any CPU.ActiveCfg = Release|Any CPU + {8B0F1074-750E-4D64-BF23-A1E0F54261E5}.V4 Release|Any CPU.Build.0 = Release|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.DelaySigned Release|Any CPU.ActiveCfg = Release|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.DelaySigned Release|Any CPU.Build.0 = Release|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.DelaySigned Silverlight Release|Any CPU.ActiveCfg = Silverlight Release|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.DelaySigned Silverlight Release|Any CPU.Build.0 = Silverlight Release|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.FxCop|Any CPU.ActiveCfg = FxCop|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.FxCop|Any CPU.Build.0 = FxCop|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Release|Any CPU.Build.0 = Release|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Silverlight 4 Debug|Any CPU.ActiveCfg = Silverlight 4 Debug|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Silverlight 4 Debug|Any CPU.Build.0 = Silverlight 4 Debug|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Silverlight 4 Release|Any CPU.ActiveCfg = Silverlight 4 Release|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Silverlight 4 Release|Any CPU.Build.0 = Silverlight 4 Release|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Silverlight Debug|Any CPU.ActiveCfg = Silverlight Debug|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Silverlight Debug|Any CPU.Build.0 = Silverlight Debug|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Silverlight Release|Any CPU.ActiveCfg = Silverlight Release|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Silverlight Release|Any CPU.Build.0 = Silverlight Release|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.SpecSharp|Any CPU.ActiveCfg = Silverlight 4 Release|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.SpecSharp|Any CPU.Build.0 = Silverlight 4 Release|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.V4 Debug|Any CPU.ActiveCfg = V4 Debug|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.V4 Debug|Any CPU.Build.0 = V4 Debug|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.V4 Release|Any CPU.ActiveCfg = V4 Release|Any CPU + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.V4 Release|Any CPU.Build.0 = V4 Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4} = {491B4A6F-D38A-49CA-BDE8-A7693919CB0B} - {EB66B766-6354-4208-A3D4-AACBDCB5C3B3} = {491B4A6F-D38A-49CA-BDE8-A7693919CB0B} + {02FF0909-F5AD-48CF-A86A-345E721B7E40} = {491B4A6F-D38A-49CA-BDE8-A7693919CB0B} {8B0F1074-750E-4D64-BF23-A1E0F54261E5} = {491B4A6F-D38A-49CA-BDE8-A7693919CB0B} + {EB66B766-6354-4208-A3D4-AACBDCB5C3B3} = {491B4A6F-D38A-49CA-BDE8-A7693919CB0B} EndGlobalSection EndGlobal diff --git a/Clojure/Simple.Console/Simple.Console.csproj b/Clojure/Simple.Console/Simple.Console.csproj index f5058bf92..0f287dd08 100644 --- a/Clojure/Simple.Console/Simple.Console.csproj +++ b/Clojure/Simple.Console/Simple.Console.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 9.0.30729 + 9.0.21022 2.0 {B57B71C6-A952-41A1-ABF1-9B9BACDD12ED} Exe @@ -18,7 +18,7 @@ full false bin\Debug\ - DEBUG;TRACE + TRACE;DEBUG;CLR2 prompt 4 diff --git a/Clojure/Simple.Console/SimpleConsole.cs b/Clojure/Simple.Console/SimpleConsole.cs index bfd611fec..a9ae67a18 100644 --- a/Clojure/Simple.Console/SimpleConsole.cs +++ b/Clojure/Simple.Console/SimpleConsole.cs @@ -5,8 +5,12 @@ using clojure.lang; using System.Diagnostics; using System.IO; -using Microsoft.Linq.Expressions; -using Microsoft.Scripting.Generation; +#if CLR2 +using Microsoft.Scripting.Ast; +#else +using System.Linq.Expressions; +#endif +//using Microsoft.Scripting.Generation; namespace clojure.console {