Mercurial > hg > graal-compiler

comparison graal/com.oracle.truffle.ruby.parser/src/com/oracle/truffle/ruby/parser/JRubyParser.java @ 13736:64fa70319890

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 3f27e57439ed
comparison
equal deleted inserted replaced
13735:2c1c805153e6 13736:64fa70319890
159 break; 159 break;
160 default: 160 default:
161 throw new UnsupportedOperationException(); 161 throw new UnsupportedOperationException();
162 } 162 }
163 163
164 final RootNode root = new RubyRootNode(truffleNode.getSourceSection(), indicativeName, truffleNode); 164 final RootNode root = new RubyRootNode(truffleNode.getSourceSection(), environment.getFrameDescriptor(), indicativeName, truffleNode);
165 165
166 // Return the root and the frame descriptor 166 // Return the root and the frame descriptor
167 167 return new RubyParserResult(root);
168 return new RubyParserResult(root, environment.getFrameDescriptor());
169 } finally { 168 } finally {
170 if (debugManager != null) { 169 if (debugManager != null) {
171 debugManager.notifyFinishedLoading(source); 170 debugManager.notifyFinishedLoading(source);
172 } 171 }
173 } 172 }