Merge pull request #1605 from jeremyz/master

FFI compatibility enhancement

kernel/platform/enum.rb

@@ -52,5 +52,10 @@ def [](sym)
       @kv_map[sym]
     end
 
+    def symbol(value)
+      key,val = @kv_map.detect { |key,val| val==value }
+      return key
+    end
+
   end
 end

kernel/platform/library.rb

@@ -230,17 +230,16 @@ def callback(a1, a2, a3=nil)
 
     def typedef(old, add)
       @typedefs ||= Rubinius::LookupTable.new
-
-      unless old.kind_of? Rubinius::NativeFunction
-        old = find_type(old)
-      end
-
-      @typedefs[add] = old
+      @typedefs[add] = find_type(old)
     end
 
     def find_type(name)
       @typedefs ||= Rubinius::LookupTable.new
 
+      if name.kind_of? Rubinius::NativeFunction or name.kind_of? FFI::Enum
+          return name
+      end
+
       if type = @typedefs[name]
         return type
       end
@@ -263,7 +262,7 @@ def enum(*args)
       enum = FFI::Enum.new values, tag
 
       if tag
-        typedef(:int, tag)
+        typedef(enum, tag)
         @tagged_enums[tag] = enum
       else
         @anon_enums << enum
@@ -287,7 +286,8 @@ def enum_value(value)
       if enum = @anon_enums.detect { |enum| enum.symbols.include?(value) }
         enum
       else
-       @tagged_enums.detect { |tag,enum| enum.symbols.include?(value) }
+       tag,enum = @tagged_enums.detect { |tag,enum| enum.symbols.include?(value) }
+       return enum
       end
 
     end

kernel/platform/load_order18.txt

@@ -1,4 +1,5 @@
 ffi.rbc
+enum.rbc
 library.rbc
 pointer_accessors.rbc
 pointer.rbc
@@ -7,4 +8,3 @@ file.rbc
 math.rbc
 posix.rbc
 struct.rbc
-enum.rbc

kernel/platform/load_order19.txt

@@ -1,4 +1,5 @@
 ffi.rbc
+enum.rbc
 library.rbc
 pointer_accessors.rbc
 pointer.rbc
@@ -8,4 +9,3 @@ math.rbc
 math19.rbc
 posix.rbc
 struct.rbc
-enum.rbc

kernel/platform/load_order20.txt

@@ -1,4 +1,5 @@
 ffi.rbc
+enum.rbc
 library.rbc
 pointer_accessors.rbc
 pointer.rbc