Tidy up specs.

Author: aardvark179

doc/contributor/interop_implicit_api.md

@@ -20,10 +20,9 @@ Format: `Ruby code` sends `InteropLibrary message`
 - `foreign_object.nil?` sends `isNull(foreign_object)`
 - `foreign_object.size` sends `getArraySize(foreign_object)`
 - `foreign_object.keys` sends `getMembers(foreign_object)`
-- `foreign_object.method_name` sends `readMember(foreign_object, method_name)` if member is not invocable
 - `foreign_object.method_name` sends `invokeMember(foreign_object, method_name)` if member is invocable
-- `foreign_object.method_name` sends `readMember(foreign_object, method_name)` if member is readable and not invokable
-- `foreign_object.method_name` sends `readMember(foreign_object, method_name)`
+- `foreign_object.method_name` sends `readMember(foreign_object, method_name)` if member is readable
+- `foreign_object.method_name` sends `readMember(foreign_object, method_name)` and raises if member is not invocable or readable
 - `foreign_object.method_name(*arguments)` sends `invokeMember(foreign_object, method_name, *arguments)` if member is readable and invokable
 - `foreign_object.method_name(*arguments) &block` sends `invokeMember(foreign_object, method_name, *arguments, block)`
 - `foreign_object.new(*arguments)` sends `instantiate(foreign_object, *arguments)`

spec/truffle/interop/special_forms_spec.rb

@@ -145,34 +145,26 @@
     l.log.should include(['getMembers', false])
   end
 
-  it description['.method_name', :readMember, ['method_name'], 'if member is not invocable'] do
-    pfo, obj, l = proxy[Object.new]
-    -> { pfo.foo }.should raise_error(NameError)
-    l.log.should include(["isMemberInvocable", "foo"])
-    l.log.should include(["readMember", "foo"])
-  end
-
   it description['.method_name', :invokeMember, ['method_name'], 'if member is invocable'] do
     pfo, obj, l = proxy[Class.new { def foo; 3; end }.new]
     pfo.foo
     l.log.should include(["isMemberInvocable", "foo"])
     l.log.should include(["invokeMember", "foo"])
   end
 
-  it description['.method_name', :readMember, ['method_name'], 'if member is readable and not invokable'] do
+  it description['.method_name', :readMember, ['method_name'], 'if member is readable'] do
     pfo, obj, l = proxy[TruffleInteropSpecs::PolyglotMember.new]
     pfo.foo = :bar
     pfo.foo
     l.log.should include(["isMemberInvocable", "foo"])
     l.log.should include(["readMember", "foo"])
   end
 
-  it description['.method_name', :readMember, ['method_name']] do
-    pfo, obj, l = proxy[TruffleInteropSpecs::PolyglotMember.new]
-    pfo.foo = Proc.new { :bar }
-    pfo.foo.should == :bar
+  it description['.method_name', :readMember, ['method_name'], 'and raises if member is not invocable or readable'] do
+    pfo, obj, l = proxy[Object.new]
+    -> { pfo.foo }.should raise_error(NameError)
     l.log.should include(["isMemberInvocable", "foo"])
-    l.log.should include(["invokeMember", "foo"])
+    l.log.should include(["readMember", "foo"])
   end
 
   it description['.method_name(*arguments)', :invokeMember, ['method_name', '*arguments'], 'if member is readable and invokable'] do
@@ -206,7 +198,8 @@
   it description['.class', :getMetaObject] do
     pfo, obj, l = proxy[Truffle::Debug.foreign_object]
     pfo.class.should == Truffle::Interop::Foreign
-    Truffle::Interop.to_display_string(Truffle::Debug.foreign_object).should include("hasMetaObject()")
+    Truffle::Interop.to_display_string(Truffle::Debug.foreign_object)
+    l.log.should include(["hasMetaObject"])
   end
 
   it doc['.inspect', 'returns a Ruby-style `#inspect` string showing members, array elements, etc'] do