Merlin/Main/Languages/Ruby/Scripts/license_check.rb Merlin/Main/Languages/Ruby/Tests/Interop/net/bcl/ienumerable/implementation_spec.rb Merlin/Main/Languages/Ruby/Tests/Interop/net/fields/shared/access.rb Merlin/Main/Languages/Ruby/Tests/Interop/net/ruby/additions/clr_new_spec.rb Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/ruby/additions/clr_new_tags.txt @@ -1,7 +1 @@ -fails:Kernel#system can run basic things that exist -fails:Kernel#system returns false when it can't fails:Kernel#system does not write to stderr when it can't find a command -fails:Kernel#system uses /bin/sh if freaky shit is in the command -fails:Kernel#system is a private method -fails:Kernel#system expands shell variables when given a single string argument -fails:Kernel#system does not expand shell variables when given multiples arguments Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/core/kernel/system_tags.txt @@ -57,4 +57,22 @@ describe "The private keyword" do lambda {Private::H.new.foo}.should raise_error(NoMethodError) Private::H.new.send(:foo).should == 'foo' end + + it "is overwritten by subclasses" do + module Private + module ModD + include D + def foo + "foo" + end + end + + class ClassD + include ModD + end + end + + Private::ClassD.should have_instance_method("foo") + Private::ClassD.should_not have_private_instance_method("foo") + end end Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/rubyspec/language/private_spec.rb @@ -3,24 +3,29 @@ require 'ftools' describe "File.copy" do before(:each) do - system "echo 'hello rubinius' > copy_test" - system "chmod a+x copy_test" + @src = tmp("copy_test") + @dest = tmp("copy_test_dest") + File.open(@src, "w") {|f| f.puts "hello ruby"} + File.chmod(0777, @src) end after(:each) do - File.unlink "copy_test" - File.unlink "copy_test_dest" rescue nil + File.unlink @src + File.unlink @dest rescue nil end it "copies the file at 1st arg to the file at 2nd arg" do - File.copy("copy_test", "copy_test_dest") - fd = File.open("copy_test_dest") + File.copy @src, @dest + fd = File.open @dest data = fd.read - data.should == "hello rubinius\n" + data.should == "hello ruby\n" fd.close - - omode = File.stat("copy_test").mode - mode = File.stat("copy_test_dest").mode + end + + it "copies the file mode to the dest file" do + File.copy @src, @dest + omode = File.stat(@src).mode + mode = File.stat(@dest).mode omode.should == mode end Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/rubyspec/library/ftools/copy_spec.rb @@ -1 +1,16 @@ +# **************************************************************************** +# +# Copyright (c) Microsoft Corporation. +# +# This source code is subject to terms and conditions of the Microsoft Public License. A +# copy of the license can be found in the License.html file at the root of this distribution. If +# you cannot locate the Microsoft Public License, please send an email to +# ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound +# by the terms of the Microsoft Public License. +# +# You must not remove this notice, or any other, from this software. +# +# +# **************************************************************************** + require 'PresentationCore, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' Merlin/Main/Languages/Ruby/Libs/PresentationCore.rb @@ -1 +1,16 @@ +# **************************************************************************** +# +# Copyright (c) Microsoft Corporation. +# +# This source code is subject to terms and conditions of the Microsoft Public License. A +# copy of the license can be found in the License.html file at the root of this distribution. If +# you cannot locate the Microsoft Public License, please send an email to +# ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound +# by the terms of the Microsoft Public License. +# +# You must not remove this notice, or any other, from this software. +# +# +# **************************************************************************** + require 'PresentationFramework, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' Merlin/Main/Languages/Ruby/Libs/PresentationFramework.rb @@ -1 +1,16 @@ +# **************************************************************************** +# +# Copyright (c) Microsoft Corporation. +# +# This source code is subject to terms and conditions of the Microsoft Public License. A +# copy of the license can be found in the License.html file at the root of this distribution. If +# you cannot locate the Microsoft Public License, please send an email to +# ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound +# by the terms of the Microsoft Public License. +# +# You must not remove this notice, or any other, from this software. +# +# +# **************************************************************************** + require 'System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' Merlin/Main/Languages/Ruby/Libs/System.Data.rb @@ -1 +1,16 @@ +# **************************************************************************** +# +# Copyright (c) Microsoft Corporation. +# +# This source code is subject to terms and conditions of the Microsoft Public License. A +# copy of the license can be found in the License.html file at the root of this distribution. If +# you cannot locate the Microsoft Public License, please send an email to +# ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound +# by the terms of the Microsoft Public License. +# +# You must not remove this notice, or any other, from this software. +# +# +# **************************************************************************** + require 'System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' Merlin/Main/Languages/Ruby/Libs/System.Drawing.rb @@ -1 +1,16 @@ +# **************************************************************************** +# +# Copyright (c) Microsoft Corporation. +# +# This source code is subject to terms and conditions of the Microsoft Public License. A +# copy of the license can be found in the License.html file at the root of this distribution. If +# you cannot locate the Microsoft Public License, please send an email to +# ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound +# by the terms of the Microsoft Public License. +# +# You must not remove this notice, or any other, from this software. +# +# +# **************************************************************************** + require "System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" Merlin/Main/Languages/Ruby/Libs/System.Windows.Forms.rb @@ -1 +1,16 @@ +# **************************************************************************** +# +# Copyright (c) Microsoft Corporation. +# +# This source code is subject to terms and conditions of the Microsoft Public License. A +# copy of the license can be found in the License.html file at the root of this distribution. If +# you cannot locate the Microsoft Public License, please send an email to +# ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound +# by the terms of the Microsoft Public License. +# +# You must not remove this notice, or any other, from this software. +# +# +# **************************************************************************** + require "WindowsBase, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" Merlin/Main/Languages/Ruby/Libs/WindowsBase.rb @@ -1 +1,17 @@ +# **************************************************************************** +# +# Copyright (c) Microsoft Corporation. +# +# This source code is subject to terms and conditions of the Microsoft Public License. A +# copy of the license can be found in the License.html file at the root of this distribution. If +# you cannot locate the Microsoft Public License, please send an email to +# ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound +# by the terms of the Microsoft Public License. +# +# You must not remove this notice, or any other, from this software. +# +# +# **************************************************************************** + + # No-op file since we won't support this under Windows Merlin/Main/Languages/Ruby/Libs/etc.rb @@ -1,3 +1,18 @@ +# **************************************************************************** +# +# Copyright (c) Microsoft Corporation. +# +# This source code is subject to terms and conditions of the Microsoft Public License. A +# copy of the license can be found in the License.html file at the root of this distribution. If +# you cannot locate the Microsoft Public License, please send an email to +# ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound +# by the terms of the Microsoft Public License. +# +# You must not remove this notice, or any other, from this software. +# +# +# **************************************************************************** + #placeholder for either throwing an error, or implementing a readline library #the basics here are just to past specs class Prime Merlin/Main/Languages/Ruby/Libs/prime.rb @@ -1 +1,16 @@ +# **************************************************************************** +# +# Copyright (c) Microsoft Corporation. +# +# This source code is subject to terms and conditions of the Microsoft Public License. A +# copy of the license can be found in the License.html file at the root of this distribution. If +# you cannot locate the Microsoft Public License, please send an email to +# ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound +# by the terms of the Microsoft Public License. +# +# You must not remove this notice, or any other, from this software. +# +# +# **************************************************************************** + #placeholder for either throwing an error, or implementing a readline library Merlin/Main/Languages/Ruby/Libs/syslog.rb @@ -1,3 +1,18 @@ +# **************************************************************************** +# +# Copyright (c) Microsoft Corporation. +# +# This source code is subject to terms and conditions of the Microsoft Public License. A +# copy of the license can be found in the License.html file at the root of this distribution. If +# you cannot locate the Microsoft Public License, please send an email to +# ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound +# by the terms of the Microsoft Public License. +# +# You must not remove this notice, or any other, from this software. +# +# +# **************************************************************************** + require 'WindowsBase' require 'PresentationCore' require 'PresentationFramework' Merlin/Main/Languages/Ruby/Samples/DiskUse/app.rb @@ -1,3 +1,18 @@ +# **************************************************************************** +# +# Copyright (c) Microsoft Corporation. +# +# This source code is subject to terms and conditions of the Microsoft Public License. A +# copy of the license can be found in the License.html file at the root of this distribution. If +# you cannot locate the Microsoft Public License, please send an email to +# ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound +# by the terms of the Microsoft Public License. +# +# You must not remove this notice, or any other, from this software. +# +# +# **************************************************************************** + include System include System::Windows Merlin/Main/Languages/Ruby/Samples/DiskUse/dialog_util.rb @@ -1,3 +1,18 @@ +# **************************************************************************** +# +# Copyright (c) Microsoft Corporation. +# +# This source code is subject to terms and conditions of the Microsoft Public License. A +# copy of the license can be found in the License.html file at the root of this distribution. If +# you cannot locate the Microsoft Public License, please send an email to +# ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound +# by the terms of the Microsoft Public License. +# +# You must not remove this notice, or any other, from this software. +# +# +# **************************************************************************** + include System::IO class DiskFile Merlin/Main/Languages/Ruby/Samples/DiskUse/file_struct.rb @@ -1,3 +1,18 @@ +# **************************************************************************** +# +# Copyright (c) Microsoft Corporation. +# +# This source code is subject to terms and conditions of the Microsoft Public License. A +# copy of the license can be found in the License.html file at the root of this distribution. If +# you cannot locate the Microsoft Public License, please send an email to +# ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound +# by the terms of the Microsoft Public License. +# +# You must not remove this notice, or any other, from this software. +# +# +# **************************************************************************** + require 'dialog_util' require 'file_struct' include System Merlin/Main/Languages/Ruby/Samples/DiskUse/renderers.rb @@ -1,3 +1,18 @@ +# **************************************************************************** +# +# Copyright (c) Microsoft Corporation. +# +# This source code is subject to terms and conditions of the Microsoft Public License. A +# copy of the license can be found in the License.html file at the root of this distribution. If +# you cannot locate the Microsoft Public License, please send an email to +# ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound +# by the terms of the Microsoft Public License. +# +# You must not remove this notice, or any other, from this software. +# +# +# **************************************************************************** + require 'file_struct' require 'renderers' require 'dialog_util' Merlin/Main/Languages/Ruby/Samples/DiskUse/ui_logic.rb @@ -1 +1,16 @@ +# **************************************************************************** +# +# Copyright (c) Microsoft Corporation. +# +# This source code is subject to terms and conditions of the Microsoft Public License. A +# copy of the license can be found in the License.html file at the root of this distribution. If +# you cannot locate the Microsoft Public License, please send an email to +# ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound +# by the terms of the Microsoft Public License. +# +# You must not remove this notice, or any other, from this software. +# +# +# **************************************************************************** + require 'System.Management.Automation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' Merlin/Main/Languages/Ruby/Samples/IRPowerShell/System.Management.Automation.rb @@ -1,3 +1,18 @@ +# **************************************************************************** +# +# Copyright (c) Microsoft Corporation. +# +# This source code is subject to terms and conditions of the Microsoft Public License. A +# copy of the license can be found in the License.html file at the root of this distribution. If +# you cannot locate the Microsoft Public License, please send an email to +# ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound +# by the terms of the Microsoft Public License. +# +# You must not remove this notice, or any other, from this software. +# +# +# **************************************************************************** + require 'System.Management.Automation' include System::Management::Automation Merlin/Main/Languages/Ruby/Samples/IRPowerShell/minsysreq.rb @@ -1,3 +1,18 @@ +# **************************************************************************** +# +# Copyright (c) Microsoft Corporation. +# +# This source code is subject to terms and conditions of the Microsoft Public License. A +# copy of the license can be found in the License.html file at the root of this distribution. If +# you cannot locate the Microsoft Public License, please send an email to +# ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound +# by the terms of the Microsoft Public License. +# +# You must not remove this notice, or any other, from this software. +# +# +# **************************************************************************** + require 'powershell' Merlin/Main/Languages/Ruby/Samples/IRPowerShell/minsysreq_ps.rb @@ -1,3 +1,18 @@ +# **************************************************************************** +# +# Copyright (c) Microsoft Corporation. +# +# This source code is subject to terms and conditions of the Microsoft Public License. A +# copy of the license can be found in the License.html file at the root of this distribution. If +# you cannot locate the Microsoft Public License, please send an email to +# ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound +# by the terms of the Microsoft Public License. +# +# You must not remove this notice, or any other, from this software. +# +# +# **************************************************************************** + require 'tutorial' # TryRuby tutorial, adapted from http://tryruby.hobix.com Merlin/Main/Languages/Ruby/Samples/Tutorial/Tutorials/tryruby_tutorial.rb @@ -1,4 +1,19 @@ -using System; +/* **************************************************************************** + * + * Copyright (c) Microsoft Corporation. + * + * This source code is subject to terms and conditions of the Microsoft Public License. A + * copy of the license can be found in the License.html file at the root of this distribution. If + * you cannot locate the Microsoft Public License, please send an email to + * ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound + * by the terms of the Microsoft Public License. + * + * You must not remove this notice, or any other, from this software. + * + * + * ***************************************************************************/ + +using System; using System.Collections.Generic; using System.Configuration; using System.Data; @@ -13,4 +28,4 @@ namespace Tutorial public partial class App : Application { } -} \ No newline at end of file +} Merlin/Main/Languages/Ruby/Samples/Tutorial/design/Tutorial/App.xaml.cs @@ -1,4 +1,19 @@ -using System; +/* **************************************************************************** + * + * Copyright (c) Microsoft Corporation. + * + * This source code is subject to terms and conditions of the Microsoft Public License. A + * copy of the license can be found in the License.html file at the root of this distribution. If + * you cannot locate the Microsoft Public License, please send an email to + * ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound + * by the terms of the Microsoft Public 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; @@ -25,4 +40,4 @@ namespace Tutorial // Insert code required on object creation below this point. } } -} \ No newline at end of file +} Merlin/Main/Languages/Ruby/Samples/Tutorial/design/Tutorial/MainWindow.xaml.cs @@ -1,4 +1,19 @@ -using System.Reflection; +/* **************************************************************************** + * + * Copyright (c) Microsoft Corporation. + * + * This source code is subject to terms and conditions of the Microsoft Public License. A + * copy of the license can be found in the License.html file at the root of this distribution. If + * you cannot locate the Microsoft Public License, please send an email to + * ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound + * by the terms of the Microsoft Public License. + * + * You must not remove this notice, or any other, from this software. + * + * + * ***************************************************************************/ + +using System.Reflection; using System.Resources; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; Merlin/Main/Languages/Ruby/Samples/Tutorial/design/Tutorial/Properties/AssemblyInfo.cs @@ -1,4 +1,19 @@ -using System; +/* **************************************************************************** + * + * Copyright (c) Microsoft Corporation. + * + * This source code is subject to terms and conditions of the Microsoft Public License. A + * copy of the license can be found in the License.html file at the root of this distribution. If + * you cannot locate the Microsoft Public License, please send an email to + * ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound + * by the terms of the Microsoft Public License. + * + * You must not remove this notice, or any other, from this software. + * + * + * ***************************************************************************/ + +using System; using System.Collections.Generic; using System.Text; using System.Windows; @@ -23,4 +38,4 @@ namespace Tutorial this.InitializeComponent(); } } -} \ No newline at end of file +} Merlin/Main/Languages/Ruby/Samples/Tutorial/design/Tutorial/StepControl.xaml.cs @@ -1,4 +1,19 @@ -using System; +/* **************************************************************************** + * + * Copyright (c) Microsoft Corporation. + * + * This source code is subject to terms and conditions of the Microsoft Public License. A + * copy of the license can be found in the License.html file at the root of this distribution. If + * you cannot locate the Microsoft Public License, please send an email to + * ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound + * by the terms of the Microsoft Public License. + * + * You must not remove this notice, or any other, from this software. + * + * + * ***************************************************************************/ + +using System; using System.Collections.Generic; using System.Text; using System.Windows; @@ -23,4 +38,4 @@ namespace Tutorial this.InitializeComponent(); } } -} \ No newline at end of file +} Merlin/Main/Languages/Ruby/Samples/Tutorial/design/Tutorial/TutorialControl.xaml.cs Merlin/Main/Languages/Ruby/Tests/Interop/net/A/a.generated.dll Merlin/Main/Languages/Ruby/Tests/Interop/net/B/b.generated.dll @@ -22,9 +22,6 @@ describe "Equality" do def Equals(other) other == :clr_marker end end - # Uncommenting the base type declartion causes an assert since Equatable has a static method as well as instance method - # called "Equals", and IronRuby does not deal with this. Since the example will not work anyway until NewTypeMaker is fixed, - # we just comment out the base type to prevent a blocking assert from popping up class EqualityCheckerSubtype < Equatable end Merlin/Main/Languages/Ruby/Tests/Interop/net/bcl/equality/equality_spec.rb @@ -1,4 +1,5 @@ require File.dirname(__FILE__) + '/../spec_helper' +require File.dirname(__FILE__) + '/shared/access' describe "Reading .NET Fields" do csc <<-EOL @@ -22,77 +23,63 @@ describe "Reading .NET Fields" do protected static string protectedStaticField = "protected static"; protected static readonly string protectedStaticReadOnlyField = "protected static readonly"; } - #pragma warning restore 414 + + #pragma warning disable 649 + public class InternalFieldTester { + internal string MyField; + + public InternalFieldTester() { + var runtime = ScriptRuntime.CreateFromConfiguration(); + var engine = runtime.GetEngine("IronRuby"); + var scope = engine.CreateScope(); + scope.SetVariable("foo", this); + engine.Execute("foo.MyField = 'Hello'", scope); + } + } + #pragma warning restore 414, 649 EOL before :each do @klass = ClassWithFields.new end describe "works with public" do - it "fields" do - @klass.field.should equal_clr_string("field") - end - - it "const fields" do - ClassWithFields.constField.should equal_clr_string("const") - end - - it "readonly fields" do - @klass.readOnlyField.should equal_clr_string("readonly") - end - - it "static fields" do - ClassWithFields.staticField.should equal_clr_string("static") - end - - it "static readonly fields" do - ClassWithFields.staticReadOnlyField.should equal_clr_string("static readonly") - end + before(:each) do + @result = { + :field => [:field, "field"], + :const_field => [:constField, "const"], + :readonly => [:readOnlyField, "readonly"], + :static => [:staticField, "static"], + :static_ro => [:staticReadOnlyField, "static readonly"] + } + end + it_behaves_like :accessing_fields, nil end describe "works with protected" do - it "fields" do - @klass.protectedField.should equal_clr_string("protected field") - end - - it "const fields" do - ClassWithFields.protectedConstField.should equal_clr_string("protected const") - end - - it "readonly fields" do - @klass.protectedReadOnlyField.should equal_clr_string("protected readonly") - end - - it "static fields" do - ClassWithFields.protectedStaticField.should equal_clr_string("protected static") - end - - it "static readonly fields" do - ClassWithFields.protectedStaticReadOnlyField.should equal_clr_string("protected static readonly") - end + before(:each) do + @result = { + :field => [:protectedField, "protected field"], + :const_field => [:protectedConstField, "protected const"], + :readonly => [:protectedReadOnlyField, "protected readonly"], + :static => [:protectedStaticField, "protected static"], + :static_ro => [:protectedStaticReadOnlyField, "protected static readonly"] + } + end + it_behaves_like :accessing_fields, nil end if IronRuby.dlr_config.private_binding describe "works with private" do - it "fields" do - @klass.privateField.should equal_clr_string("private field") - end - - it "const fields" do - @klass.privateConstField.should equal_clr_string("private const") - end - - it "readonly fields" do - @klass.privateReadOnlyField.should equal_clr_string("private readonly") - end - - it "static fields" do - ClassWithFields.privateStaticField.should equal_clr_string("private static") - end - - it "static readonly fields" do - ClassWithFields.privateStaticReadOnlyField.should equal_clr_string("private static readonly") - end + before(:each) do + @result = { + :field => [:privateField, "private field"], + :const_field => [:privateConstField, "private const"], + :readonly => [:privateReadOnlyField, "private readonly"], + :static => [:privateStaticField, "private static"], + :static_ro => [:privateStaticReadOnlyField, "private static readonly"] + } + end + it_behaves_like :accessing_fields, nil end end end @@ -175,5 +162,12 @@ describe "Setting .NET Fields" do end end end + + describe "Internal fields" do + #TODO: shared behavior when 1651 is fixed + it "can't be assigned from within a IronRuby engine in the constructor" do + lambda {InternalFieldTester.new}.should raise_error NoMethodError + end + end end Merlin/Main/Languages/Ruby/Tests/Interop/net/fields/access_spec.rb @@ -1,4 +1,5 @@ using System; +using System.Collections; using System.Runtime.InteropServices; using Microsoft.Scripting.Hosting; using IronRuby.Runtime; @@ -9,7 +10,7 @@ public partial class Klass { return arg0; } } -#line 37 "./bcl/equality/equality_spec.rb" +#line 34 "./bcl/equality/equality_spec.rb" public static class EqualityChecker { public static new bool Equals(object o1, object o2) { return o1.Equals(o2); } } @@ -37,6 +38,20 @@ public class IComparableConsumer { public class IComparableProvider { } +#line 4 "./bcl/ienumerable/implementation_spec.rb" +#line 7 "./bcl/ienumerable/implementation_spec.rb" +public interface ITestList : IEnumerable { + } + + public class Tester { + public ArrayList Test(ITestList list) { + ArrayList l = new ArrayList(); + foreach(var item in list) { + l.Add(item); + } + return l; + } + } #line 5 "./bcl/numerics/byte_spec.rb" public partial class NumericHelper { public static int SizeOfByte() { @@ -252,7 +267,7 @@ public class ClassWithEvents { public event EventHandler OnEvent; } #pragma warning restore 67 -#line 4 "./fields/access_spec.rb" +#line 5 "./fields/access_spec.rb" #pragma warning disable 414 public partial class ClassWithFields { public string field = "field"; @@ -273,7 +288,20 @@ public class ClassWithEvents { protected static string protectedStaticField = "protected static"; protected static readonly string protectedStaticReadOnlyField = "protected static readonly"; } - #pragma warning restore 414 + + #pragma warning disable 649 + public class InternalFieldTester { + internal string MyField; + + public InternalFieldTester() { + var runtime = ScriptRuntime.CreateFromConfiguration(); + var engine = runtime.GetEngine("IronRuby"); + var scope = engine.CreateScope(); + scope.SetVariable("foo", this); + engine.Execute("foo.MyField = 'Hello'", scope); + } + } + #pragma warning restore 414, 649 #line 4 "./interface/implementation_spec.rb" public interface IDoFoo { int Foo(string str); @@ -750,18 +778,18 @@ public partial class ClassWithMethods { protected string ProtectedMethod() {return "protected";} private string PrivateMethod() {return "private";} } -#line 39 "./method/reflection_spec.rb" +#line 59 "./method/reflection_spec.rb" public abstract partial class AbstractClassWithMethods { public abstract string PublicMethod(); protected abstract string ProtectedMethod(); } -#line 87 "./method/reflection_spec.rb" +#line 107 "./method/reflection_spec.rb" public partial class ClassWithOverloads { public string Overloaded() { return "empty"; } public string Overloaded(int arg) { return "one arg"; } public string Overloaded(int arg1, int arg2) { return "two args"; } } -#line 127 "./method/reflection_spec.rb" +#line 147 "./method/reflection_spec.rb" public partial class Klass{ public static int StaticVoidMethod() { return 1; @@ -773,6 +801,16 @@ namespace NotEmptyNamespace { public static int Bar() { return 1; } } } +#line 4 "./ruby/additions/clr_new_spec.rb" +namespace CLRNew { + public class Ctor { + public int Tracker {get; set;} + + public Ctor() { + Tracker = 1; + } + } + } #line 4 "./ruby/name_mangling/public_spec.rb" public class PublicNameHolder { public string a() { return "a";} Merlin/Main/Languages/Ruby/Tests/Interop/net/fixtures.generated.cs Merlin/Main/Languages/Ruby/Tests/Interop/net/fixtures.generated.dll @@ -1,7 +1,7 @@ describe "A .NET numeric", :shared => true do before(:each) do @class = @method - @bignum = Bignum.Create(1) + @bignum = Bignum.Create(0) end it "can be induced via an int" do @@ -39,7 +39,7 @@ end describe "A .NET numeric, induceable from Fixnum", :shared => true do before(:each) do @class = @method - @bignum = Bignum.Create(1) + @bignum = Bignum.Create(0) end it "can be induced via an int" do Merlin/Main/Languages/Ruby/Tests/Interop/net/shared/numeric.rb @@ -4,6 +4,6 @@ describe "Mixed TypeGroups (with non-generic member)" do it "don't cache the class information" do c = EmptyTypeGroup.new c2 = EmptyTypeGroup1.new - c2.should_not be_kind_of EmptyTypeGroup[] + c2.should_not be_kind_of EmptyTypeGroup end end Merlin/Main/Languages/Ruby/Tests/Interop/net/typegroup/instantiation/nongeneric_spec.rb @@ -16,7 +16,7 @@ describe "Type Groups" do EOL it "maps to a Microsoft::Scripting::Actions::TypeGroup" do #MS::Scripting isn't autoloaded when it gets returned from TypeGroup.class - require 'microsoft.scripting' + load_assembly 'microsoft.scripting' [EmptyTypeGroup, EmptyTypeGroup1, TypeGroup, TypeGroup1].each do |klass| klass.should be_kind_of Microsoft::Scripting::Actions::TypeGroup Merlin/Main/Languages/Ruby/Tests/Interop/net/typegroup/mapping_spec.rb @@ -1,4 +1,2 @@ fails:System::Int64 can be induced from a Float -fails:System::Int64 can be induced from a Bignum fails:System::Int64 raises a RangeError if out of range for Float -fails:System::Int64 raises a RangeError if out of range for Bignum Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/bcl/numerics/int64_tags.txt @@ -1,4 +1,2 @@ fails:System::UInt64 can be induced from a Float -fails:System::UInt64 can be induced from a Bignum fails:System::UInt64 raises a RangeError if out of range for Float -fails:System::UInt64 raises a RangeError if out of range for Bignum Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/bcl/numerics/uint64_tags.txt @@ -1,4 +1,3 @@ -fails:Generic methods on generic classes with 2 parameters has proper error messages for skipping generic -fails:Generic methods on generic classes with 2 parameters has proper error messages for incorrect number of arguments -fails:Generic methods on generic classes with 2 parameters can use Ruby types for constrained generics fails:Generic methods on generic classes with 2 parameters has proper errors for constrained generics +fails:Generic methods on generic classes with 2 parameters can use Ruby types for constrained generics +fails:Generic methods on generic classes with 2 parameters has proper error messages for skipping generic Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/method/invocation/generic_tags.txt @@ -1,3 +1 @@ -fails:Reflecting on abstract .NET methods should be able to be grabbed as an object after call to #method -fails:Reflecting on abstract .NET methods are able to be grabbed as an object fails:Static .NET methods don't incorrectly get cached when called on an instance Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/method/reflection_tags.txt @@ -26,12 +26,8 @@ class TestFileList end class TestFileUtils - # Most of these failures are because of http://ironruby.codeplex.com/WorkItem/View.aspx?WorkItemId=1184 resulting in this error: - # NoMethodError: private method `safe_ln' called for #<TestFileUtils::BadLink:0x0002f72 @failure_class=NotImplementedError> + #we're not exiting correctly from the ruby method. def test_ruby() end - def test_safe_ln_failover_to_cp_on_not_implemented_error() end - def test_safe_ln_failover_to_cp_on_standard_error() end - def test_safe_ln_fails_on_script_error() end end class TestPathMapExplode Merlin/Main/Languages/Ruby/Tests/Scripts/RakeTests.rb @@ -1,9 +1,9 @@ @echo off if /i "%*" == "" ( - @"ruby.exe" "%~dpn0.rb" "%MERLIN_ROOT%\Languages\Ruby\Tests\Interop\net" + @"ruby.exe" "-W0" "%~dpn0.rb" "%MERLIN_ROOT%\Languages\Ruby\Tests\Interop\net" goto :END ) -@"ruby.exe" "%~dpn0.rb" "%*" +@"ruby.exe" "-W0" "%~dpn0.rb" "%*" :END Merlin/Main/Languages/Ruby/Tests/Scripts/csc.bat @@ -41,6 +41,7 @@ task :package do system %Q{xcopy /E /I "#{ENV['MERLIN_ROOT']}\\..\\External.LCA_RESTRICTED\\Languages\\Ruby\\redist-libs\\ruby" #{PACKAGE_DIR}\\lib\\ruby} system %Q{xcopy /E /I "#{ENV['MERLIN_ROOT']}\\Languages\\Ruby\\Libs" #{PACKAGE_DIR}\\lib\\IronRuby} + system %Q{xcopy /E /I "#{ENV['MERLIN_ROOT']}\\Languages\\Ruby\\Samples" #{PACKAGE_DIR}\\samples\\} # Generate compressed package if ENV['ZIP'] system %Q{del "#{ENV['TEMP']}\\ironruby.7z"} Merlin/Main/Languages/Ruby/rake/package.rake Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/core/array/delete_tags.txt Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/core/array/join_tags.txt Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/core/array/multiply_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/assembly/access/custom_assembly_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/bcl/array/conversion_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/bcl/equality/equality_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/bcl/equality/hashing_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/bcl/numerics/byte_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/bcl/numerics/decimal_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/bcl/numerics/int16_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/bcl/numerics/sbyte_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/bcl/numerics/uint16_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/bcl/numerics/uint32_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/class/derivation/attribute_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/method/invocation/overload_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/uncategorized_tags.txt 8d70f2bf7a2bae37ae7cb3ba5d3eca5fe54d46e1 Jim Deville jdeville@microsoft.com http://github.com/ironruby/ironruby/commit/825b81bb92b3e72ed10647646fa437b9a2a78f74 825b81bb92b3e72ed10647646fa437b9a2a78f74 2009-06-26T11:53:56-07:00 2009-06-26T11:53:56-07:00 syncing to head of tfs 585a4fc7a1a3918f02fadce8786c74d0cbebdea8 Jim Deville jdeville@microsoft.com