MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jjyg/master'

develop
Kelly Martin 2012-10-31 14:08:25 -05:00
parent f6856a339a 0a78064467
commit ebf2bf0c14
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/ruby/ruby-autogen-defs.rb
Unescape Escape View File

@ -181,7 +181,8 @@ module DFHack
@nume ||= const_get(:NUME) @nume ||= const_get(:NUME)
end end
def self.int(i) def self.int(i, allow_bad_sym=false)
raise ArgumentError, "invalid enum member #{i} of #{self}" if i.kind_of?(::Symbol) and not allow_bad_sym and not nume.has_key?(i)
nume[i] || i nume[i] || i
end end
def self.sym(i) def self.sym(i)
@ -797,7 +798,6 @@ module DFHack
def isset(key) def isset(key)
raise unless @_memaddr raise unless @_memaddr
key = @_enum.int(key) if _enum key = @_enum.int(key) if _enum
raise "unknown key #{key.inspect}" if key.kind_of?(::Symbol)
DFHack.memory_stlset_isset(@_memaddr, key) DFHack.memory_stlset_isset(@_memaddr, key)
end end
alias is_set? isset alias is_set? isset
@ -805,14 +805,12 @@ module DFHack
def set(key) def set(key)
raise unless @_memaddr raise unless @_memaddr
key = @_enum.int(key) if _enum key = @_enum.int(key) if _enum
raise "unknown key #{key.inspect}" if key.kind_of?(::Symbol)
DFHack.memory_stlset_set(@_memaddr, key) DFHack.memory_stlset_set(@_memaddr, key)
end end
def delete(key) def delete(key)
raise unless @_memaddr raise unless @_memaddr
key = @_enum.int(key) if _enum key = @_enum.int(key) if _enum
raise "unknown key #{key.inspect}" if key.kind_of?(::Symbol)
DFHack.memory_stlset_deletekey(@_memaddr, key) DFHack.memory_stlset_deletekey(@_memaddr, key)
end end