Skip to content

Commit 0e6eb6e

Browse files
committed
Remove PrimitiveFailure
1 parent bdf5b1f commit 0e6eb6e

File tree

4 files changed

+12
-32
lines changed

4 files changed

+12
-32
lines changed

src/main/java/org/truffleruby/core/CoreLibrary.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1495,7 +1495,6 @@ public DynamicObject getStructClass() {
14951495
"/core/gc.rb",
14961496
"/core/nil.rb",
14971497
"/core/truffle/platform.rb",
1498-
"/core/support.rb",
14991498
"/core/string.rb",
15001499
"/core/random.rb",
15011500
"/core/truffle/kernel_operations.rb",

src/main/ruby/truffleruby/core/exception.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,6 @@ def location
150150
end
151151
end
152152

153-
class PrimitiveFailure < Exception
154-
end
155-
156153
class ScriptError < Exception
157154
end
158155

src/main/ruby/truffleruby/core/module.rb

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -106,24 +106,20 @@ def const_get(name, inherit = true)
106106
return value
107107
end
108108

109-
if name.kind_of?(String)
110-
names = name.split('::')
111-
unless names.empty?
112-
names.shift if '' == names.first
113-
end
114-
raise NameError, "wrong constant name #{name}" if names.empty? || names.include?('')
115-
res = self
116-
names.each do |s|
117-
if res.kind_of?(Module)
118-
res = res.const_get(s, inherit)
119-
else
120-
raise TypeError, "#{name} does not refer to a class/module"
121-
end
109+
names = name.split('::') # name is always String
110+
unless names.empty?
111+
names.shift if '' == names.first
112+
end
113+
raise NameError, "wrong constant name #{name}" if names.empty? || names.include?('')
114+
res = self
115+
names.each do |s|
116+
if res.kind_of?(Module)
117+
res = res.const_get(s, inherit)
118+
else
119+
raise TypeError, "#{name} does not refer to a class/module"
122120
end
123-
res
124-
else
125-
raise PrimitiveFailure
126121
end
122+
res
127123
end
128124

129125
def self.constants(inherited = undefined)

src/main/ruby/truffleruby/core/support.rb

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)