# HG changeset patch # User Andreas Woess # Date 1413897092 -7200 # Node ID f444ef4684ec8bca9380a4bfc6d56bc0043d08c6 # Parent d405651001d1bfef7b8dc48ab7f9bb69f0b1e604 SL: sanitize whitespace in ATG diff -r d405651001d1 -r f444ef4684ec graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/SimpleLanguage.atg --- 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 (. factory.finishFunction(body); .) @@ -85,12 +85,12 @@ Block = (. factory.startBlock(); List body = new ArrayList<>(); .) -"{" (. int start = t.charPos; .) +"{" (. int start = t.charPos; .) { Statement (. 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 | ReturnStatement @@ -116,23 +116,23 @@ WhileStatement = -"while" (. Token whileToken = t; .) -"(" +"while" (. Token whileToken = t; .) +"(" Expression -")" +")" Block (. result = factory.createWhile(whileToken, condition, body); .) . IfStatement = -"if" (. Token ifToken = t; .) +"if" (. Token ifToken = t; .) "(" -Expression +Expression ")" -Block (. SLStatementNode elsePart = null; .) +Block (. SLStatementNode elsePart = null; .) [ - "else" + "else" Block ] (. result = factory.createIf(ifToken, condition, thenPart, elsePart); .) . @@ -209,14 +209,14 @@ [ Expression (. parameters.add(parameter); .) { - "," + "," Expression (. parameters.add(parameter); .) - } + } ] - ")" (. Token finalToken = t; .) - (. result = factory.createCall(nameToken, parameters, finalToken); .) + ")" (. Token finalToken = t; .) + (. result = factory.createCall(nameToken, parameters, finalToken); .) | - "=" + "=" Expression (. result = factory.createAssignment(nameToken, value); .) | (. result = factory.createRead(nameToken); .) @@ -226,11 +226,11 @@ | numericLiteral (. result = factory.createNumericLiteral(t); .) | - "(" (. int start = t.charPos; .) - Expression (. SLExpressionNode expr = result; .) - ")" (. int length = (t.charPos + t.val.length()) - start; .) - (. result = factory.createParenExpression(expr, start, length); .) -) + "(" (. int start = t.charPos; .) + Expression (. SLExpressionNode expr = result; .) + ")" (. int length = (t.charPos + t.val.length()) - start; .) + (. result = factory.createParenExpression(expr, start, length); .) +) .