Mercurial > hg > truffle
changeset 18410:f444ef4684ec
SL: sanitize whitespace in ATG
| author | Andreas Woess <andreas.woess@jku.at> |
|---|---|
| date | Tue, 21 Oct 2014 15:11:32 +0200 |
| parents | d405651001d1 |
| children | dc2e000bed40 |
| files | graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/SimpleLanguage.atg |
| diffstat | 1 files changed, 26 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/SimpleLanguage.atg Tue Nov 18 23:11:00 2014 +0100 +++ b/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/SimpleLanguage.atg Tue Oct 21 15:11:32 2014 +0200 @@ -56,7 +56,7 @@ SimpleLanguage = -Function +Function { Function } @@ -66,15 +66,15 @@ Function = "function" -identifier (. Token identifierToken = t; .) -"(" (. int bodyStartPos = t.charPos; .) - (. factory.startFunction(identifierToken, bodyStartPos); .) +identifier (. Token identifierToken = t; .) +"(" (. int bodyStartPos = t.charPos; .) + (. factory.startFunction(identifierToken, bodyStartPos); .) [ identifier (. factory.addFormalParameter(t); .) { - "," + "," identifier (. factory.addFormalParameter(t); .) - } + } ] ")" Block<out SLStatementNode body, false> (. factory.finishFunction(body); .) @@ -85,12 +85,12 @@ Block<out SLStatementNode result, boolean inLoop> = (. factory.startBlock(); List<SLStatementNode> body = new ArrayList<>(); .) -"{" (. int start = t.charPos; .) +"{" (. int start = t.charPos; .) { Statement<out SLStatementNode s, inLoop> (. body.add(s); .) } "}" (. int length = (t.charPos + t.val.length()) - start; .) - (. result = factory.finishBlock(body, start, length); .) + (. result = factory.finishBlock(body, start, length); .) . @@ -104,7 +104,7 @@ | "continue" (. if (inLoop) { result = factory.createContinue(t); } else { SemErr("continue used outside of loop"); } .) ";" -| +| IfStatement<out result, inLoop> | ReturnStatement<out result> @@ -116,23 +116,23 @@ WhileStatement<out SLStatementNode result> = -"while" (. Token whileToken = t; .) -"(" +"while" (. Token whileToken = t; .) +"(" Expression<out SLExpressionNode condition> -")" +")" Block<out SLStatementNode body, true> (. result = factory.createWhile(whileToken, condition, body); .) . IfStatement<out SLStatementNode result, boolean inLoop> = -"if" (. Token ifToken = t; .) +"if" (. Token ifToken = t; .) "(" -Expression<out SLExpressionNode condition> +Expression<out SLExpressionNode condition> ")" -Block<out SLStatementNode thenPart, inLoop> (. SLStatementNode elsePart = null; .) +Block<out SLStatementNode thenPart, inLoop> (. SLStatementNode elsePart = null; .) [ - "else" + "else" Block<out elsePart, inLoop> ] (. result = factory.createIf(ifToken, condition, thenPart, elsePart); .) . @@ -209,14 +209,14 @@ [ Expression<out parameter> (. parameters.add(parameter); .) { - "," + "," Expression<out parameter> (. parameters.add(parameter); .) - } + } ] - ")" (. Token finalToken = t; .) - (. result = factory.createCall(nameToken, parameters, finalToken); .) + ")" (. Token finalToken = t; .) + (. result = factory.createCall(nameToken, parameters, finalToken); .) | - "=" + "=" Expression<out SLExpressionNode value> (. result = factory.createAssignment(nameToken, value); .) | (. result = factory.createRead(nameToken); .) @@ -226,11 +226,11 @@ | numericLiteral (. result = factory.createNumericLiteral(t); .) | - "(" (. int start = t.charPos; .) - Expression<out result> (. SLExpressionNode expr = result; .) - ")" (. int length = (t.charPos + t.val.length()) - start; .) - (. result = factory.createParenExpression(expr, start, length); .) -) + "(" (. int start = t.charPos; .) + Expression<out result> (. SLExpressionNode expr = result; .) + ")" (. int length = (t.charPos + t.val.length()) - start; .) + (. result = factory.createParenExpression(expr, start, length); .) +) .