Merge pull request #3518 from rubinius/2.2

WIP: 2.2 compat
rubinius · Jan 4, 2016 · d8e5c64 · d8e5c64
2 parents 6b35d17 + 649739c
commit d8e5c64
Show file tree

Hide file tree

Showing 68 changed files with 1,386 additions and 332 deletions.
diff --git a/configure b/configure
@@ -1239,6 +1239,46 @@ int main() { return tgetnum(""); }
       @defines << "HAVE_GETTID"
     end
 
+    if has_struct_member("stat", "st_atim", ["sys/stat.h"])
+      @defines << "HAVE_STRUCT_STAT_ST_ATIM"
+    end
+
+    if has_struct_member("stat", "st_atimespec", ["sys/stat.h"])
+      @defines << "HAVE_STRUCT_STAT_ST_ATIMESPEC"
+    end
+
+    if has_struct_member("stat", "st_atimensec", ["sys/stat.h"])
+      @defines << "HAVE_STRUCT_STAT_ST_ATIMENSEC"
+    end
+
+    if has_struct_member("stat", "st_mtim", ["sys/stat.h"])
+      @defines << "HAVE_STRUCT_STAT_ST_MTIM"
+    end
+
+    if has_struct_member("stat", "st_mtimespec", ["sys/stat.h"])
+      @defines << "HAVE_STRUCT_STAT_ST_MTIMESPEC"
+    end
+
+    if has_struct_member("stat", "st_mtimensec", ["sys/stat.h"])
+      @defines << "HAVE_STRUCT_STAT_ST_MTIMENSEC"
+    end
+
+    if has_struct_member("stat", "st_ctim", ["sys/stat.h"])
+      @defines << "HAVE_STRUCT_STAT_ST_CTIM"
+    end
+
+    if has_struct_member("stat", "st_ctimespec", ["sys/stat.h"])
+      @defines << "HAVE_STRUCT_STAT_ST_CTIMESPEC"
+    end
+
+    if has_struct_member("stat", "st_ctimensec", ["sys/stat.h"])
+      @defines << "HAVE_STRUCT_STAT_ST_CTIMENSEC"
+    end
+
+    if has_struct_member("stat", "st_birthtimespec", ["sys/stat.h"])
+      @defines << "HAVE_ST_BIRTHTIME"
+    end
+
     # glibc has useless lchmod() so we don't try to use lchmod() on linux
     if !@linux and has_function("lchmod", ["sys/stat.h", "unistd.h"])
       @have_lchmod = true

diff --git a/kernel/bootstrap/stat.rb b/kernel/bootstrap/stat.rb
@@ -87,6 +87,11 @@ def ctime
       raise PrimitiveFailure, "Rubinius::Stat#ctime primitive failed"
     end
 
+    def birthtime
+      Rubinius.primitive :stat_birthtime
+      raise NotImplementedError, "birthtime() function is unimplemented on this machine"
+    end
+
     def inspect
       "#<#{self.class.name} dev=0x#{self.dev.to_s(16)}, ino=#{self.ino}, " \
       "mode=#{sprintf("%07d", self.mode.to_s(8).to_i)}, nlink=#{self.nlink}, " \

diff --git a/kernel/common/binding.rb b/kernel/common/binding.rb
@@ -3,8 +3,8 @@ class Binding
   attr_accessor :compiled_code
   attr_accessor :constant_scope
   attr_accessor :proc_environment
-  attr_accessor :self
   attr_accessor :location
+  attr_accessor :receiver
 
   def from_proc?
     @proc_environment
@@ -29,7 +29,7 @@ def self.self_context(recv, variables)
   def self.setup(variables, code, constant_scope, recv=nil, location=nil)
     bind = allocate()
 
-    bind.self = self_context(recv, variables)
+    bind.receiver = self_context(recv, variables)
     bind.variables = variables
     bind.compiled_code = code
     bind.constant_scope = constant_scope
@@ -54,4 +54,8 @@ def eval(expr, filename=nil, lineno=nil)
 
     Kernel.eval(expr, self, filename, lineno)
   end
+
+  def local_variables
+    variables.local_variables
+  end
 end
diff --git a/kernel/common/dir.rb b/kernel/common/dir.rb
@@ -174,6 +174,11 @@ def each
     self
   end
 
+  def fileno
+    Rubinius.primitive :dir_fileno
+    raise PrimitiveFailure, "Dir#fileno primitive failed"
+  end
+
   attr_reader :path
 
   alias_method :to_path, :path