Mercurial > hg > truffle
diff graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/Parser.java @ 16687:7c8ddb4233cd
SL/SourceAttribution: restore some attribution fixes that were lost in a tussle with hg; turn off tracing code in SL tests.
| author | Michael Van De Vanter <michael.van.de.vanter@oracle.com> |
|---|---|
| date | Mon, 04 Aug 2014 18:53:21 -0700 |
| parents | 888907296590 |
| children | 7661cc464239 |
line wrap: on
line diff
--- a/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/Parser.java Fri Aug 01 18:24:22 2014 -0700 +++ b/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/Parser.java Mon Aug 04 18:53:21 2014 -0700 @@ -134,8 +134,10 @@ void Function() { Expect(4); Expect(1); - factory.startFunction(t); + Token identifierToken = t; Expect(5); + int bodyStartPos = t.charPos; + factory.startFunction(identifierToken, bodyStartPos); if (la.kind == 1) { Get(); factory.addFormalParameter(t); @@ -219,8 +221,8 @@ SLStatementNode IfStatement(boolean inLoop) { SLStatementNode result; Expect(14); + Token ifToken = t; Expect(5); - Token ifToken = t; SLExpressionNode condition = Expression(); Expect(7); SLStatementNode thenPart = Block(inLoop);