M500 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ac4623172c8c3593148e5d41021c7e6af22b5cde
-  data.tar.gz: 81508c65134aac2effd6d6c26c7d16254dc53cf9
+SHA256:
+  metadata.gz: 2dc24579fe7c9767f59040551729b3ba6b218e1031e030337d7e2e291839361b
+  data.tar.gz: f57431bbd2ed5c261e44ab1a31ca41eb685531b11e0fac126714119c004d4fdc
 SHA512:
-  metadata.gz: '0903c099d74d1148920d289fc9710e061f05200546e74b1b680bbff5c477f978e2f2dea898848b14a1c6add45469bf747f838edfa7960615ef2483a75ef69c73'
-  data.tar.gz: 7e3912857a7f424725749fe6bcb1ad14df71334e53f537e6e65a58321dba1f3488d4794a7dde99ecf8d155a3235350cfab6bfd2ee65caf6c28c0327e17bb3684
+  metadata.gz: a4f951a70a40917ee45ca1ae515a977c459c8e54f3f8f9fc50c0bca24bff3a9c6d7572adcda48afc0e872ce64334fa9901129e79950df3520b1596fbdceff174
+  data.tar.gz: 7abff1db81d08621b76323450d904f8b990015c7e3762dc4b9a266e17a446055c9cf57f8fb5bccb5e9cdcde12ef2b815ee5ecab0e2510c589b077ff5e15a4c49

data/lib/m500.rb

@@ -1,9 +1,12 @@
+# -*- coding: utf-8 -*-
 #
 #   M500.rb - 
 #   	$Release Version: 0.9 $
-#       $Revision: 1.47 $
+#       $Revision: 1.48 $
 #   	by mark ingram
 #
+#       Ruby 2.4 depcrecated Fixnum and Bignum
+#       Attempt to use Integer instead
 # --
 #
 #   
@@ -114,7 +117,7 @@ class String
   def is_R?
     false
   end
-   def to_N
+  def to_N
     re = /(^[0-9]+)/
     md = re.match(self.to_s)
     t = emptySet
@@ -135,7 +138,7 @@ class String
   def to_Q
     re = /(-?[0-9]+)\/([0-9]+)/
     md = re.match(self.to_s)
-    ret = naught
+    ret = emptySet
     if md then
       t = 1
       Natural(md[2].to_i).kind_of?(EmptySetClass) ? ret = infinity : ret = Quotient(Zahlen(md[1].to_i),Natural(md[2].to_i))
@@ -321,6 +324,7 @@ class Numeric
     end
   end
 end
+=begin
 class Fixnum
   include SGML
   def to_sgml
@@ -373,10 +377,11 @@ class Fixnum
     naught
   end
 end
-class Bignum
+=end
+class Integer
   include SGML
   def to_sgml
-    "<mn #{sgml_id}class='rational'>#{self.to_s}</mn>"
+    "<mn #{sgml_id}class='integer'>#{self.to_s}</mn>"
   end
   unless defined? Complex
     alias power! **
@@ -400,13 +405,13 @@ class Bignum
     self === 0 ? true : false
   end
   def to_N
-    self < 0 ? Natural(self) : emptySet
+    self > 0 ? Natural(self) : emptySet
   end
   def to_N0
-    self <= 0 ? Counting(self) : emptySet
+    self >= 0 ? Counting(self) : emptySet
   end
   def to_Z
-    Zahlen(self)
+    Zahlen(self)  
   end
   def to_Frac
     Fraction(self,Quotient(1,1))
@@ -498,6 +503,7 @@ class Rational
   end
 end
 class ST<Numeric
+=begin
   def initialize(a,b=0,c='t') # a*(c) + b
     if a.kind_of?(String)
       regex = /(\d+[a-z])*(\+)?(\d+)?/
@@ -552,6 +558,7 @@ class ST<Numeric
   def inspect
     "'#{@a.at(0)}#{@a.at(2)}+#{@a.at(1)}'.to_ST"
   end
+=end
 end
 def naught
   NaughtClass.new!
@@ -574,7 +581,7 @@ def Natural(a)
     infinity
   elsif (a.kind_of?(String))
     Natural.new!(a.to_i)
-  elsif (a.kind_of?(Fixnum) && a >= 1) or (a.kind_of?(Bignum) && a >= 1)
+  elsif (a.kind_of?(Integer) && a >= 1)  #(a.kind_of?(Fixnum) && a >= 1) or (a.kind_of?(Bignum) && a >= 1)
     Natural.new!(a)
   elsif  a.kind_of?(Numeric)
     a.send :to_N
@@ -583,7 +590,7 @@ def Natural(a)
   end
 end
 def Counting(a)
-  if (a.kind_of?(Fixnum) && a >= 0) or (a.kind_of?(Bignum) && a >= 0)
+  if (a.kind_of?(Integer) && a >= 0) #(a.kind_of?(Fixnum) && a >= 0) or (a.kind_of?(Bignum) && a >= 0)
     Counting.new!(a)
   elsif  (a.kind_of?(EmptySetClass))
     emptySet
@@ -596,20 +603,18 @@ def Counting(a)
   elsif a.kind_of?(Numeric)
     a.send :to_N0
   else
-   EmptySet
+   emptySet
   end
 end
 def Zahlen(a)
-  if a.kind_of?(Zahlen)
-     a
+  if a.kind_of?(Integer)
+    Zahlen.new!(a)
   elsif  (a.kind_of?(EmptySetClass))
     emptySet
   elsif (a.kind_of?(NaughtClass))
     Zahlen.new!(0)
   elsif (a.kind_of?(InfinityClass))
     infinity
-  elsif a.kind_of?(Fixnum) or a.kind_of?(Bignum)
-    Zahlen.new!(a)
   elsif a.kind_of?(Numeric)
     a.send :to_Z
   else
@@ -644,11 +649,7 @@ def Quotient(a,b=1)
   elsif b.kind_of?(Quotient) && a == 1
     Quotient.new!(b.denominator,b.numerator)
   elsif Zahlen(a).kind_of?(Numeric) and Natural(b).kind_of?(Numeric)
-    unless a == b
-      Quotient.new!(Zahlen(a),Natural(b)) 
-    else
       Quotient.new!(Zahlen(a),Natural(b)) 
-    end
   elsif a.kind_of?(Quotient) && b.kind_of?(Quotient)
     return a/b
   elsif a.kind_of?(Numeric)
@@ -706,7 +707,7 @@ def Decimal(a,b=nil,c='0',d=0,e=1)
     infinity
   elsif a.kind_of?(String)
     a.to_Dec
-  elsif (a.kind_of?(Fixnum) or a.kind_of?(Bignum)) and (b.kind_of?(Fixnum) or b.kind_of?(Bignum))
+  elsif a.kind_of?(Integer)  #(a.kind_of?(Fixnum) or a.kind_of?(Bignum)) and (b.kind_of?(Fixnum) or b.kind_of?(Bignum))
     if e<0 then
       Decimal.new!(a,b,c,d,-1)
     else
@@ -718,7 +719,7 @@ def Decimal(a,b=nil,c='0',d=0,e=1)
         Decimal.new!(0,b,c,d,1)
       end
     end
-  elsif (a.kind_of?(Fixnum) or a.kind_of?(Bignum)) and b.nil?
+  elsif (a.kind_of?(Integer)  and b.nil?) #(a.kind_of?(Fixnum) or a.kind_of?(Bignum)) and b.nil?
     if e<0 then
       Decimal.new!(a,b,c,d,-1)
     else
@@ -746,7 +747,7 @@ def Kettenbruch(a,b='',c=1,leicht=true)
     a.to_K
   elsif a.kind_of?(Proc)
     a
-  elsif (a.kind_of?(Fixnum) or a.kind_of?(Bignum)) and b.kind_of?(String)
+  elsif (a.kind_of?(Integer) and  b.kind_of?(String)) # (a.kind_of?(Fixnum) or a.kind_of?(Bignum)) and b.kind_of?(String)
     if (a>0 and c<0) or (a<0 and c>0) then
       Kettenbruch.new!(a,b,-1)
     else
@@ -784,7 +785,7 @@ class Natural < Numeric
   end
   private_class_method :new
   def initialize(a)
-    if (a.kind_of?(Fixnum) && a >= 1) or (a.kind_of?(Bignum) && a >= 1)
+    if (a.kind_of?(Integer) && a >= 1) #(a.kind_of?(Fixnum) && a >= 1) or (a.kind_of?(Bignum) && a >= 1)
       @a = a
     else 
       emptySet
@@ -792,7 +793,7 @@ class Natural < Numeric
   end
   private :initialize
   def + (a)
-    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Bignum) or a.kind_of?(Fixnum)
+    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Integer)#a.kind_of?(Bignum) or a.kind_of?(Fixnum)
       Natural(self.to_i + a.to_i)
     elsif a.kind_of?(NaughtClass) or a.kind_of?(EmptySetClass) or a.kind_of?(NilClass)
       self
@@ -806,7 +807,7 @@ class Natural < Numeric
     end
   end
   def - (a)
-    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Bignum) or a.kind_of?(Fixnum)
+    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Integer) # a.kind_of?(Bignum) or a.kind_of?(Fixnum)
       z =  @a.to_i - a.to_i
       z <= 0 ? emptySet : Natural(z)
     elsif a.kind_of?(NaughtClass) or a.kind_of?(EmptySetClass)
@@ -819,7 +820,7 @@ class Natural < Numeric
     end
   end
   def * (a)
-    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Bignum) or a.kind_of?(Fixnum)
+    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Integer) #a.kind_of?(Bignum) or a.kind_of?(Fixnum)
       Natural(@a * a.to_i)
     elsif a.kind_of?(NaughtClass) or a.kind_of?(EmptySetClass)
       naught
@@ -831,7 +832,7 @@ class Natural < Numeric
     end
   end
   def / (a)
-    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Bignum) or a.kind_of?(Fixnum)
+    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Integer) #a.kind_of?(Bignum) or a.kind_of?(Fixnum)
       Natural(self.to_i / a.to_i)
     elsif a.kind_of?(NaughtClass) or a.kind_of?(EmptySetClass)
       infinity
@@ -841,7 +842,7 @@ class Natural < Numeric
     end
   end
   def ** (a)
-    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Bignum) or a.kind_of?(Fixnum)
+    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Integer) #a.kind_of?(Bignum) or a.kind_of?(Fixnum)
       Natural(self.to_i ** a.to_i)
     else
       x, y = a.coerce(self)
@@ -873,7 +874,7 @@ class Natural < Numeric
     self.to_i <=> other.to_i
   end
   def coerce(other)
-    if Fixnum === other or Bignum === other
+    if Integer === other #Fixnum === other or Bignum === other
       other <= 0 ? [emptySet,emptySet] : [other.to_N,self]
     elsif Natural === other or Counting === other or Zahlen === other
       other <= 0 ? [emptySet,emptySet] : [other,self.to_Z]
@@ -894,11 +895,8 @@ class Natural < Numeric
   def to_f
     @a.to_f
   end
-  def to_s!
-    "Natural(#{@a})"
-  end
   def to_s
-    @a.to_s
+    "Natural(#{@a})"
   end
   def to_Q
     Quotient(self, 1)
@@ -1012,11 +1010,11 @@ class Natural < Numeric
       rz = 0
       rx = []
       r.each{|r4|
-        rx << eval("k=0;#{r4}") }
+        rx << instance_eval("k=0;#{r4}") }
       ry =  rx.max
       (0..m).to_a.each{|k|
         r.each{|r4|
-          r0 << eval("k=#{k};#{r4}")
+          r0 << instance_eval("k=#{k};#{r4}")
         }
         rz= r0.max
         res = res + r0
@@ -1081,11 +1079,8 @@ class NaughtClass
   def to_f
     0.0
   end
-  def to_s!
-    "naught"
-  end
   def to_s
-    "0"
+    "naught"
   end
   def to_N
     emptySet
@@ -1123,12 +1118,36 @@ class EmptySetClass < NaughtClass
   def to_sgml
     "<mn #{sgml_id}class='empty'>&empty</mn>"
   end
-  def to_s!
-    "{}"
-  end
   def to_s
     "\u2205".encode('utf-8')
   end
+  def to_N
+    self.to_s
+  end
+  def to_N0
+    self.to_s
+  end
+  def to_Z
+    self.to_s
+  end
+  def to_Frac
+    self.to_s
+  end
+  def to_Q
+    self.to_s
+  end
+  def to_Dec
+    self.to_s
+  end
+  def to_Sig
+    self.to_s
+  end
+  def to_K
+    self.to_s
+  end
+  def to_R
+    self.to_s
+  end
 end
 class NANClass < NaughtClass
   include SGML
@@ -1172,9 +1191,6 @@ class InfinityClass
   def to_f
     nil
   end
-  def to_s!
-    "infinity"
-  end
   def to_s
     "\u221E".encode('utf-8')
   end
@@ -1227,13 +1243,13 @@ class Counting < Natural
   def initialize(a)
     if (a.kind_of?(Counting))
       @a = a.to_i
-    elsif a.kind_of?(Fixnum) or a.kind_of?(Bignum)
+    elsif a.kind_of?(Integer) #a.kind_of?(Fixnum) or a.kind_of?(Bignum)
       @a = a
     else
     end
   end
   def + (a)
-    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Bignum) or a.kind_of?(Fixnum)
+    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Integer) #a.kind_of?(Bignum) or a.kind_of?(Fixnum)
       Counting(@a+a)
     elsif a.kind_of?(Decimal) or a.kind_of?(Quotient) or a.kind_of?(Fraction)
       Counting(@a+a.to_N0)
@@ -1247,7 +1263,7 @@ class Counting < Natural
     end
   end
   def - (a)
-    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Bignum) or a.kind_of?(Fixnum)
+    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Integer) #a.kind_of?(Bignum) or a.kind_of?(Fixnum)
       @a-a < 0 ? emptySet : Counting(@a-a)
     elsif a.kind_of?(NaughtClass) or a.kind_of?(EmptySetClass)
       self
@@ -1260,7 +1276,7 @@ class Counting < Natural
   end
   def * (a)
     t = nil
-    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Bignum) or a.kind_of?(Fixnum)
+    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Integer) # or a.kind_of?(Bignum) or a.kind_of?(Fixnum)
       a < 0 ? emptySet : Counting(@a*a)
     elsif a.kind_of?(NaughtClass) or a.kind_of?(EmptySetClass)
       naught
@@ -1274,13 +1290,14 @@ class Counting < Natural
   def / (a)
     if (a.kind_of?(Counting) or a.kind_of?(Natural)) and (self.to_i%(a.to_i) == 0)
      a < 0 ? emptySet : Counting(@a/ a)
-    else
-      x, y = a.coerce(self)
-      y < 0 ? emptySet : Counting(x/y)
+    else #not divisable so will not be whole number return emptySet
+      #y < 0 ? emptySet : Counting(x/y)
+#x, y = a.coerce(self)
+      return emptySet
     end
   end
   def ** (a)
-    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Bignum) or a.kind_of?(Fixnum)
+    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Integer) #a.kind_of?(Bignum) or a.kind_of?(Fixnum)
       Counting(self.to_i ** a.to_i)
     else
       x, y = a.coerce(self)
@@ -1338,11 +1355,8 @@ class Counting < Natural
   def to_f
     @a.to_f
   end
-  def to_s!
-    "Counting(#{@a})"
-  end
   def to_s
-    @a.to_s
+    "Counting(#{@a})"
   end
   def to_N
     Natural(@a)
@@ -1386,13 +1400,13 @@ class Zahlen < Counting
   def initialize(a)
     if (a.kind_of?(Zahlen))
       @a = a.to_i
-    elsif a.kind_of?(Fixnum) or a.kind_of?(Bignum)
+    elsif a.kind_of?(Integer) #a.kind_of?(Fixnum) or a.kind_of?(Bignum)
       @a = a
     else
     end
   end
   def + (a)
-    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Bignum) or a.kind_of?(Fixnum)
+    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Integer) #a.kind_of?(Bignum) or a.kind_of?(Fixnum)
       Zahlen(self.to_i + a.to_i)
     elsif a.kind_of?(Quotient) or a.kind_of?(Fraction)
       a + Quotient(@a,1)
@@ -1406,7 +1420,7 @@ class Zahlen < Counting
     end
   end
   def - (a)
-    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Bignum) or a.kind_of?(Fixnum)
+    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Integer) #a.kind_of?(Bignum) or a.kind_of?(Fixnum)
       Zahlen(self.to_i - a.to_i)
     elsif a.kind_of?(Quotient) or a.kind_of?(Fraction)
       a - Quotient(@a,1)
@@ -1420,7 +1434,7 @@ class Zahlen < Counting
     end
   end
   def * (a)
-    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Bignum) or a.kind_of?(Fixnum)
+    if a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Integer) # a.kind_of?(Bignum) or a.kind_of?(Fixnum)
       Zahlen(self.to_i * a.to_i)
     elsif a.kind_of?(Quotient) or a.kind_of?(Fraction)
       a * Quotient(@a,1)
@@ -1434,7 +1448,7 @@ class Zahlen < Counting
     end
   end
   def / (a)
-    if (a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Bignum) or a.kind_of?(Fixnum)) and self.to_i%(a.to_i) == 0
+    if (a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Integer)) and self.to_i%(a.to_i) == 0 #a.kind_of?(Bignum) or a.kind_of?(Fixnum)) and self.to_i%(a.to_i) == 0
       Zahlen(self.to_i / a.to_i)
     elsif a.kind_of?(Quotient) or a.kind_of?(Fraction)
       self * Quotient(a.to_Q.denominator,a.to_Q.numerator)
@@ -1490,17 +1504,18 @@ class Zahlen < Counting
   def to_f
     @a.to_f
   end
-  def to_s!
-    "Zahlen(#{@a})"
-  end
   def to_s
-    @a.to_s
+    "Zahlen(#{@a})"
   end
   def to_N
     Natural(@a)
   end
+  def to_N0
+    Counting(@a)
+  end
   def to_Z
-    Zahlen(@a)
+    self
+    #Zahlen(@a)
   end
   def to_Frac
     Fraction(@a,Quotient(0,1))
@@ -1550,6 +1565,9 @@ class Quotient < Numeric
       b = -1*b if (a<0 and b<0)
       @abs1 = 1
     end
+    if b==0 then
+# this should have been caught in def Quotient
+    end
     if a.kind_of?(Numeric) and b.kind_of?(Numeric)
       a.kind_of?(Zahlen) ? @a = a : @a = Zahlen(a.to_i)
       b.kind_of?(Natural) ? @b = b : @b = Natural(b.to_i)
@@ -1588,7 +1606,7 @@ class Quotient < Numeric
       self
     elsif a.kind_of?(NANClass) or a.kind_of?(InfinityClass)
       infinity
-    elsif (a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Bignum) or a.kind_of?(Fixnum))
+    elsif (a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Integer)) # a.kind_of?(Bignum) or a.kind_of?(Fixnum))
       self + Quotient(a, 1)
     elsif a.kind_of?(Float)
       Float(self) + a
@@ -1611,7 +1629,7 @@ class Quotient < Numeric
         self
       elsif a.kind_of?(NANClass) or a.kind_of?(InfinityClass)
         infinity*(-1)
-      elsif (a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Bignum) or a.kind_of?(Fixnum)) 
+      elsif (a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Integer)) #a.kind_of?(Bignum) or a.kind_of?(Fixnum)) 
         self - Quotient.new!(a, 1)
       elsif a.kind_of?(Float)
         Float(self) - a
@@ -1633,7 +1651,7 @@ class Quotient < Numeric
       naught
     elsif a.kind_of?(NANClass) or a.kind_of?(InfinityClass)
       infinity
-    elsif (a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Bignum) or a.kind_of?(Fixnum)) 
+    elsif (a.kind_of?(Zahlen) or a.kind_of?(Counting) or a.kind_of?(Natural) or a.kind_of?(Integer)) #a.kind_of?(Bignum) or a.kind_of?(Fixnum)) 
       if a ==1 then
         self
       else
@@ -1754,7 +1772,7 @@ class Quotient < Numeric
   def coerce(other)
     if Natural === other or Counting === other or Zahlen === other
       [Quotient(other,1),self]
-    elsif Fixnum === other
+    elsif Integer === other #Fixnum === other
       [other, self.to_f]
     else
       [Float(other),self.to_f]
@@ -1770,6 +1788,7 @@ class Quotient < Numeric
     @numerator.to_f/@denominator.to_f
   end
   def to_Frac
+    Fraction(Zahlen(@numerator),Natural(@denominator))
     self >= 0 ? Fraction(Zahlen(@numerator),Natural(@denominator),1) : Fraction(Zahlen(@numerator),Natural(@denominator),-1)
   end
   def to_Dec
@@ -1814,10 +1833,10 @@ class Quotient < Numeric
     end
     eval(ret)
   end
-  def to_s!
+  def to_s
     "Quotient(#{(@a*@abs1).to_s},#{@b.to_s})"
   end
-  def to_s
+  def to_s_KM
     if @b == 1
       (@a*@abs1).to_s
     else
@@ -1831,7 +1850,8 @@ class Quotient < Numeric
     @numerator.hash ^ @denominator.hash ^ @abs.hash
   end
 end
-class Decimal < Numeric 
+
+class Decimal < Numeric
   def Decimal.new!(a,b,c=0,d=0,e=1)
     new(a,b,c,d,e)
   end
@@ -2181,7 +2201,7 @@ class Decimal < Numeric
     t0 = ""
     t0 = "0"*(@decimalExponent - 1) if @decimalExponent>0
     t = "#{e}#{@integraldecimal}#{@@decimalSeparator}#{t0}#{@decimalfraction}#{@repetend.call}"
-    eval("#{@@precision}.times{patt_succ(t)}")
+    instance_eval("#{@@precision}.times{patt_succ(t)}")
     return t
   end
   def inspect
@@ -2311,7 +2331,7 @@ class Fraction < Numeric #Mixed fraction
       num = @properfraction.numerator * a.denominator
       num_a = a.numerator * @properfraction.denominator
       Fraction(num + num_a, @properfraction.denominator * a.denominator)
-    elsif a.kind_of?(Integer)or a.kind_of?(Fixnum)
+    elsif a.kind_of?(Integer) #or a.kind_of?(Fixnum)
      a == 0 ? self: self + Fraction.new!(a, Quotient(0,1))
     elsif a.kind_of?(Float)
       Float(self) + a
@@ -2348,7 +2368,7 @@ class Fraction < Numeric #Mixed fraction
       num =  @properfraction.numerator * a.numerator
       den =  @properfraction.denominator * a.denominator
       Fraction(num, den)
-    elsif a.kind_of?(Integer) or a.kind_of?(Fixnum)
+    elsif a.kind_of?(Integer) #or a.kind_of?(Fixnum)
       if a == 0 then
         0 
       elsif a == 1 
@@ -2375,7 +2395,7 @@ class Fraction < Numeric #Mixed fraction
       den =  @properfraction.denominator * a.numerator
       Fraction(num, den) unless a.numerator == 0
       nan if a.numerator == 0
-    elsif a.kind_of?(Integer) or a.kind_of?(Fixnum)
+    elsif a.kind_of?(Integer) # or a.kind_of?(Fixnum)
       self * Fraction.new!(1,a)
     elsif a.kind_of?(NaughtClass) or a.kind_of?(EmptySetClass)
       nan
@@ -2452,6 +2472,7 @@ class Fraction < Numeric #Mixed fraction
   end
 end
 class Sigma<Numeric
+
 end
 class Kettenbruch<Numeric
   @@delta = 0
@@ -2923,6 +2944,7 @@ class Kettenbruch<Numeric
 end
 class Real< Numeric
   include SGML
+  @@reals={}
   @@threebareqs = "\u2261"
   def to_sgml
     "<mn #{sgml_id}class='Real'>#{@a}</mn>"
@@ -2930,7 +2952,7 @@ class Real< Numeric
   def Real.defines
     @@threebareqs.encode('utf-8')
   end
-  def Real.new!(num,a,b)
+  def Real.new!(a,b,label='')
     if a.kind_of?(Real)
       a
     elsif a.kind_of?(Array)
@@ -2948,6 +2970,9 @@ class Real< Numeric
       a
     end
   end
+  def Real.s_add(a,b,label='')
+    @@reals[label] = b
+  end
   def Real::epsilon(e)
     #on epsilon change flag for dirty and recalculate
   end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: M500
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - mark ingram
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-31 00:00:00.000000000 Z
+date: 2019-02-06 00:00:00.000000000 Z
 dependencies: []
-description: M500 contains easy to use classes that model modern mathematical concepts
+description: extended numbers
 email:
 - m.ingram@computer.org
 executables: []
@@ -31,7 +31,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -39,8 +39,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: M500
-rubygems_version: 2.4.8
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
-summary: extended numbers
+summary: support for Ruby 2.4 deprecation of Fixnum and Bignum
 test_files: []