@@ -47,6 +47,10 @@ namespace IronRuby.Builtins { public static partial class UInt64Ops { } + [RubyClass(Extends = typeof(Decimal), Inherits = typeof(Integer), Restrictions = ModuleRestrictions.None), Includes(typeof(ClrBigInteger), Copy = true)] + public static partial class DecimalOps{ + } + #region new, size, induced_from // *** BEGIN GENERATED CODE *** @@ -324,6 +328,45 @@ namespace IronRuby.Builtins { return MutableString.CreateMutable(RubyEncoding.Binary).Append(self.ToString()).Append(" (UInt64)"); } } + + public static partial class DecimalOps { + [RubyMethod("size")] + public static int Size(Decimal self) { + return sizeof(Decimal); + } + + [RubyConstructor] + [RubyMethod("induced_from", RubyMethodAttributes.PublicSingleton)] + public static Decimal InducedFrom(RubyClass/*!*/ self, [DefaultProtocol]int value) { + if (value >= Decimal.MinValue && value <= Decimal.MaxValue) { + return (Decimal)value; + } + throw RubyExceptions.CreateRangeError(String.Format("Integer {0} out of range of {1}", value, self.Name)); + } + + [RubyConstructor] + [RubyMethod("induced_from", RubyMethodAttributes.PublicSingleton)] + public static Decimal InducedFrom(RubyClass/*!*/ self, [NotNull]BigInteger/*!*/ value) { + if (value >= Decimal.MinValue && value <= Decimal.MaxValue) { + return (Decimal)value; + } + throw RubyExceptions.CreateRangeError(String.Format("Integer {0} out of range of {1}", value, self.Name)); + } + + [RubyConstructor] + [RubyMethod("induced_from", RubyMethodAttributes.PublicSingleton)] + public static Decimal InducedFrom(RubyClass/*!*/ self, double value) { + if ((Decimal)value >= Decimal.MinValue && (Decimal)value <= Decimal.MaxValue) { + return (Decimal)value; + } + throw RubyExceptions.CreateRangeError(String.Format("Float {0} out of range of {1}", value, self.Name)); + } + + [RubyMethod("inspect")] + public static MutableString/*!*/ Inspect(object/*!*/ self) { + return MutableString.CreateMutable(RubyEncoding.Binary).Append(self.ToString()).Append(" (Decimal)"); + } + } // *** END GENERATED CODE *** Merlin/Main/Languages/Ruby/Libraries.LCA_RESTRICTED/Extensions/ClrInteger.Generated.cs @@ -1,4 +1,4 @@ -require '../../Scripts/CodeGenerator.rb' +require '../../Scripts/CodeGenerator.rb' def range_check_fixnum(type) if type == "Int64" @@ -16,7 +16,7 @@ end generate(__FILE__) do template = DATA.read - types = ["Byte", "SByte", "Int16", "UInt16", "UInt32", "Int64", "UInt64"] + types = ["Byte", "SByte", "Int16", "UInt16", "UInt32", "Int64", "UInt64", "Decimal"] result = "" types.each do |type| Merlin/Main/Languages/Ruby/Libraries.LCA_RESTRICTED/Extensions/ClrInteger.Generator.rb @@ -224,6 +224,11 @@ namespace IronRuby.Builtins { new System.Func<IronRuby.Builtins.RubyClass, Microsoft.Scripting.Math.BigInteger, System.Byte>(IronRuby.Builtins.ByteOps.InducedFrom), new System.Func<IronRuby.Builtins.RubyClass, System.Double, System.Byte>(IronRuby.Builtins.ByteOps.InducedFrom) ); + ExtendClass(typeof(System.Decimal), def47, LoadSystem__Decimal_Instance, LoadSystem__Decimal_Class, null, IronRuby.Builtins.RubyModule.EmptyArray, + new System.Func<IronRuby.Builtins.RubyClass, System.Int32, System.Decimal>(IronRuby.Builtins.DecimalOps.InducedFrom), + new System.Func<IronRuby.Builtins.RubyClass, Microsoft.Scripting.Math.BigInteger, System.Decimal>(IronRuby.Builtins.DecimalOps.InducedFrom), + new System.Func<IronRuby.Builtins.RubyClass, System.Double, System.Decimal>(IronRuby.Builtins.DecimalOps.InducedFrom) + ); ExtendClass(typeof(System.Int16), def47, LoadSystem__Int16_Instance, LoadSystem__Int16_Class, null, IronRuby.Builtins.RubyModule.EmptyArray, new System.Func<IronRuby.Builtins.RubyClass, System.Int32, System.Int16>(IronRuby.Builtins.Int16Ops.InducedFrom), new System.Func<IronRuby.Builtins.RubyClass, Microsoft.Scripting.Math.BigInteger, System.Int16>(IronRuby.Builtins.Int16Ops.InducedFrom), @@ -2905,8 +2910,8 @@ namespace IronRuby.Builtins { ); module.DefineLibraryMethod("printf", 0x52, - new System.Action<IronRuby.Builtins.StringFormatterSiteStorage, IronRuby.Runtime.ConversionStorage<IronRuby.Builtins.MutableString>, IronRuby.Runtime.BinaryOpStorage, System.Object, IronRuby.Builtins.MutableString, System.Object[]>(IronRuby.Builtins.KernelOps.PrintFormatted), - new System.Action<IronRuby.Builtins.StringFormatterSiteStorage, IronRuby.Runtime.ConversionStorage<IronRuby.Builtins.MutableString>, IronRuby.Runtime.BinaryOpStorage, System.Object, System.Object, System.Object, System.Object[]>(IronRuby.Builtins.KernelOps.PrintFormatted) + new System.Action<IronRuby.Builtins.StringFormatterSiteStorage, IronRuby.Runtime.ConversionStorage<IronRuby.Builtins.MutableString>, IronRuby.Runtime.BinaryOpStorage, System.Object, System.Object, System.Object, System.Object[]>(IronRuby.Builtins.KernelOps.PrintFormatted), + new System.Action<IronRuby.Builtins.StringFormatterSiteStorage, IronRuby.Runtime.ConversionStorage<IronRuby.Builtins.MutableString>, IronRuby.Runtime.BinaryOpStorage, System.Object, IronRuby.Builtins.MutableString, System.Object[]>(IronRuby.Builtins.KernelOps.PrintFormatted) ); module.DefineLibraryMethod("private_methods", 0x51, @@ -3219,8 +3224,8 @@ namespace IronRuby.Builtins { ); module.DefineLibraryMethod("printf", 0x61, - new System.Action<IronRuby.Builtins.StringFormatterSiteStorage, IronRuby.Runtime.ConversionStorage<IronRuby.Builtins.MutableString>, IronRuby.Runtime.BinaryOpStorage, System.Object, IronRuby.Builtins.MutableString, System.Object[]>(IronRuby.Builtins.KernelOps.PrintFormatted), - new System.Action<IronRuby.Builtins.StringFormatterSiteStorage, IronRuby.Runtime.ConversionStorage<IronRuby.Builtins.MutableString>, IronRuby.Runtime.BinaryOpStorage, System.Object, System.Object, System.Object, System.Object[]>(IronRuby.Builtins.KernelOps.PrintFormatted) + new System.Action<IronRuby.Builtins.StringFormatterSiteStorage, IronRuby.Runtime.ConversionStorage<IronRuby.Builtins.MutableString>, IronRuby.Runtime.BinaryOpStorage, System.Object, System.Object, System.Object, System.Object[]>(IronRuby.Builtins.KernelOps.PrintFormatted), + new System.Action<IronRuby.Builtins.StringFormatterSiteStorage, IronRuby.Runtime.ConversionStorage<IronRuby.Builtins.MutableString>, IronRuby.Runtime.BinaryOpStorage, System.Object, IronRuby.Builtins.MutableString, System.Object[]>(IronRuby.Builtins.KernelOps.PrintFormatted) ); module.DefineLibraryMethod("proc", 0x61, @@ -3912,7 +3917,7 @@ namespace IronRuby.Builtins { new System.Func<IronRuby.Runtime.BlockParam, IronRuby.Builtins.RubyModule, System.Object>(IronRuby.Builtins.ModuleOps.Evaluate) ); - module.DefineLibraryMethod("module_exec", 0x51, + module.DefineLibraryMethod("module_exec", 0x51, new System.Func<IronRuby.Runtime.BlockParam, IronRuby.Builtins.RubyModule, System.Object[], System.Object>(IronRuby.Builtins.ModuleOps.Execute) ); @@ -4845,9 +4850,9 @@ namespace IronRuby.Builtins { ); module.DefineLibraryMethod("sub", 0x51, + new System.Func<IronRuby.Runtime.ConversionStorage<IronRuby.Builtins.MutableString>, IronRuby.Runtime.RubyScope, IronRuby.Runtime.BlockParam, IronRuby.Builtins.MutableString, IronRuby.Builtins.RubyRegex, System.Object>(IronRuby.Builtins.MutableStringOps.BlockReplaceFirst), new System.Func<IronRuby.Runtime.ConversionStorage<IronRuby.Builtins.MutableString>, IronRuby.Runtime.RubyScope, IronRuby.Runtime.BlockParam, IronRuby.Builtins.MutableString, IronRuby.Builtins.MutableString, System.Object>(IronRuby.Builtins.MutableStringOps.BlockReplaceFirst), - new System.Func<IronRuby.Runtime.RubyScope, IronRuby.Builtins.MutableString, IronRuby.Builtins.RubyRegex, IronRuby.Builtins.MutableString, IronRuby.Builtins.MutableString>(IronRuby.Builtins.MutableStringOps.ReplaceFirst), - new System.Func<IronRuby.Runtime.ConversionStorage<IronRuby.Builtins.MutableString>, IronRuby.Runtime.RubyScope, IronRuby.Runtime.BlockParam, IronRuby.Builtins.MutableString, IronRuby.Builtins.RubyRegex, System.Object>(IronRuby.Builtins.MutableStringOps.BlockReplaceFirst) + new System.Func<IronRuby.Runtime.RubyScope, IronRuby.Builtins.MutableString, IronRuby.Builtins.RubyRegex, IronRuby.Builtins.MutableString, IronRuby.Builtins.MutableString>(IronRuby.Builtins.MutableStringOps.ReplaceFirst) ); module.DefineLibraryMethod("sub!", 0x51, @@ -5563,6 +5568,27 @@ namespace IronRuby.Builtins { } + private static void LoadSystem__Decimal_Instance(IronRuby.Builtins.RubyModule/*!*/ module) { + LoadIronRuby__Clr__BigInteger_Instance(module); + module.DefineLibraryMethod("inspect", 0x51, + new System.Func<System.Object, IronRuby.Builtins.MutableString>(IronRuby.Builtins.DecimalOps.Inspect) + ); + + module.DefineLibraryMethod("size", 0x51, + new System.Func<System.Decimal, System.Int32>(IronRuby.Builtins.DecimalOps.Size) + ); + + } + + private static void LoadSystem__Decimal_Class(IronRuby.Builtins.RubyModule/*!*/ module) { + module.DefineLibraryMethod("induced_from", 0x61, + new System.Func<IronRuby.Builtins.RubyClass, System.Int32, System.Decimal>(IronRuby.Builtins.DecimalOps.InducedFrom), + new System.Func<IronRuby.Builtins.RubyClass, Microsoft.Scripting.Math.BigInteger, System.Decimal>(IronRuby.Builtins.DecimalOps.InducedFrom), + new System.Func<IronRuby.Builtins.RubyClass, System.Double, System.Decimal>(IronRuby.Builtins.DecimalOps.InducedFrom) + ); + + } + private static void LoadSystem__IComparable_Instance(IronRuby.Builtins.RubyModule/*!*/ module) { module.DefineLibraryMethod("<=>", 0x51, new System.Func<System.IComparable, System.Object, System.Int32>(IronRuby.Builtins.IComparableOps.Compare) Merlin/Main/Languages/Ruby/Libraries.LCA_RESTRICTED/Initializers.Generated.cs @@ -1,4 +1,4 @@ -=begin +=begin Utilities for C# source file generation. =end Merlin/Main/Languages/Ruby/Scripts/CodeGenerator.rb a25e18bd49aa22d64cd58e976dde4e7df25ee493 Jim Deville jdeville@microsoft.com http://github.com/shri/ironruby/commit/0f1af195def1504562871a0bd68e14b742192fb1 0f1af195def1504562871a0bd68e14b742192fb1 2009-09-01T10:08:30-07:00 2009-09-01T10:08:30-07:00 add System::Decimal to the generated C# code for CLR integers, note that the generator did not add a cast for the double comparison, I did that. 13dce7ff4f382d819c00bf9a0df14d5210e54364 Jim Deville jdeville@microsoft.com