Mercurial > hg > graal-jvmci-8
comparison graal/com.oracle.truffle.ruby.runtime/src/com/oracle/truffle/ruby/runtime/RubyContext.java @ 13736:64fa70319890
Merge with 9161ed8ce7964ca3df5e91894522b207a2bc4a3e
author | Michael Van De Vanter <michael.van.de.vanter@oracle.com> |
---|---|
date | Wed, 22 Jan 2014 21:34:00 -0800 |
parents | 2c1c805153e6 232eb6708943 |
children | 22bf5a8ba9eb 3f27e57439ed |
comparison
equal
deleted
inserted
replaced
13735:2c1c805153e6 | 13736:64fa70319890 |
---|---|
170 | 170 |
171 public Object execute(RubyContext context, Source source, RubyParser.ParserContext parserContext, Object self, MaterializedFrame parentFrame) { | 171 public Object execute(RubyContext context, Source source, RubyParser.ParserContext parserContext, Object self, MaterializedFrame parentFrame) { |
172 try { | 172 try { |
173 final RubyParserResult parseResult = parser.parse(context, source, parserContext, parentFrame); | 173 final RubyParserResult parseResult = parser.parse(context, source, parserContext, parentFrame); |
174 final RubyArguments arguments = new RubyArguments(parentFrame, self, null); | 174 final RubyArguments arguments = new RubyArguments(parentFrame, self, null); |
175 final CallTarget callTarget = Truffle.getRuntime().createCallTarget(parseResult.getRootNode(), parseResult.getFrameDescriptor()); | 175 final CallTarget callTarget = Truffle.getRuntime().createCallTarget(parseResult.getRootNode()); |
176 | 176 |
177 return callTarget.call(null, arguments); | 177 return callTarget.call(null, arguments); |
178 } catch (RaiseException e) { | 178 } catch (RaiseException e) { |
179 throw e; | 179 throw e; |
180 } catch (ThrowException e) { | 180 } catch (ThrowException e) { |