# HG changeset patch # User Christian Humer # Date 1384202583 -3600 # Node ID 7311354f5bf80b809ebc272746c81b2510fc52b7 # Parent 53f8adcbc474afbe1f9a42464cd95782054040f9 SL: fixed eclipse formatter problems. diff -r 53f8adcbc474 -r 7311354f5bf8 graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/Parser.java --- a/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/Parser.java Mon Nov 11 21:40:18 2013 +0100 +++ b/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/Parser.java Mon Nov 11 21:43:03 2013 +0100 @@ -21,8 +21,7 @@ * questions. */ - // The content of this file is automatically generated. DO NOT EDIT. - +// The content of this file is automatically generated. DO NOT EDIT. package com.oracle.truffle.sl.parser; @@ -34,11 +33,11 @@ // Checkstyle: stop // @formatter:off public class Parser { - public static final int _EOF = 0; - public static final int _identifier = 1; - public static final int _stringLiteral = 2; - public static final int _numericLiteral = 3; - public static final int maxT = 29; + public static final int _EOF = 0; + public static final int _identifier = 1; + public static final int _stringLiteral = 2; + public static final int _numericLiteral = 3; + public static final int maxT = 29; static final boolean T = true; static final boolean x = false; @@ -122,273 +121,273 @@ } } - void SimpleLanguage() { - Function(); - while (la.kind == 4) { - Function(); - } - } - - void Function() { - Expect(4); - factory.startFunction(); - Expect(1); - String name = t.val; - List parameterNames = new ArrayList<>(); - if (la.kind == 5) { - Get(); - if (la.kind == 1) { - Get(); - parameterNames.add(t.val); - } - while (la.kind == 6) { - Get(); - Expect(1); - parameterNames.add(t.val); - } - Expect(7); - } - StatementNode body = Block(); - factory.createFunction(body, name, parameterNames.toArray(new String[parameterNames.size()])); - } - - StatementNode Block() { - StatementNode result; - List statements = new ArrayList<>(); - Expect(8); - while (StartOf(1)) { - StatementNode statement = Statement(); - statements.add(statement); - } - Expect(9); - result = factory.createBlock(statements); - return result; - } - - StatementNode Statement() { - StatementNode result; - result = null; - if (la.kind == 13) { - result = WhileStatement(); - } else if (la.kind == 11) { - result = IfStatement(); - } else if (la.kind == 14) { - result = ReturnStatement(); - } else if (StartOf(2)) { - result = Expression(); - Expect(10); - } else SynErr(30); - return result; - } - - StatementNode WhileStatement() { - StatementNode result; - Expect(13); - Expect(5); - ConditionNode condition = Expression(); - Expect(7); - StatementNode body = Block(); - result = factory.createWhile(condition, body); - return result; - } - - StatementNode IfStatement() { - StatementNode result; - Expect(11); - Expect(5); - ConditionNode condition = Expression(); - Expect(7); - StatementNode thenNode = null; StatementNode elseNode = null; - thenNode = Block(); - if (la.kind == 12) { - Get(); - elseNode = Block(); - } - result = factory.createIf(condition, thenNode, elseNode); - return result; - } - - StatementNode ReturnStatement() { - StatementNode result; - Expect(14); - TypedNode value = Expression(); - Expect(10); - result = factory.createReturn(value); - return result; - } - - TypedNode Expression() { - TypedNode result; - result = ValueExpression(); - if (StartOf(3)) { - switch (la.kind) { - case 15: { - Get(); - break; - } - case 16: { - Get(); - break; - } - case 17: { - Get(); - break; - } - case 18: { - Get(); - break; - } - case 19: { - Get(); - break; - } - case 20: { - Get(); - break; - } - } - String op = t.val; - TypedNode right = ValueExpression(); - result = factory.createBinary(op, result, right); - } - return result; - } - - TypedNode ValueExpression() { - TypedNode result; - result = Term(); - while (la.kind == 21 || la.kind == 22) { - if (la.kind == 21) { - Get(); - } else { - Get(); - } - String op = t.val; - TypedNode right = Term(); - result = factory.createBinary(op, result, right); - } - return result; - } - - TypedNode Term() { - TypedNode result; - result = Factor(); - while (la.kind == 23 || la.kind == 24) { - if (la.kind == 23) { - Get(); - } else { - Get(); - } - String op = t.val; - TypedNode right = Factor(); - result = factory.createBinary(op, result, right); - } - return result; - } - - TypedNode Factor() { - TypedNode result; - result = null; - if (la.kind == 1) { - result = VariableRefOrCall(); - } else if (la.kind == 2) { - result = StringLiteral(); - } else if (la.kind == 3) { - result = NumericLiteral(); - } else if (la.kind == 25) { - result = Ternary(); - } else if (la.kind == 5) { - Get(); - result = Expression(); - Expect(7); - } else SynErr(31); - return result; - } - - TypedNode VariableRefOrCall() { - TypedNode result; - result = VariableRef(); - if (la.kind == 5 || la.kind == 28) { - if (la.kind == 5) { - TypedNode[] parameters = Parameters(); - result = factory.createCall(result, parameters); - } else { - Get(); - TypedNode assignment = Expression(); - result = factory.createAssignment(result, assignment); - } - } - return result; - } - - TypedNode StringLiteral() { - TypedNode result; - Expect(2); - result = factory.createStringLiteral(t.val.substring(1, t.val.length() - 1)); - return result; - } - - TypedNode NumericLiteral() { - TypedNode result; - Expect(3); - result = factory.createNumericLiteral(t.val); - return result; - } - - TypedNode Ternary() { - TypedNode result; - TypedNode condition, thenPart, elsePart; - Expect(25); - condition = Expression(); - Expect(26); - thenPart = Expression(); - Expect(27); - elsePart = Expression(); - result = factory.createTernary(condition, thenPart, elsePart); - return result; - } - - TypedNode VariableRef() { - TypedNode result; - Expect(1); - result = factory.createLocal(t.val); - return result; - } - - TypedNode[] Parameters() { - TypedNode[] result; - Expect(5); - List parameters = new ArrayList<>(); - if (StartOf(2)) { - TypedNode e1 = Expression(); - parameters.add(e1); - while (la.kind == 6) { - Get(); - TypedNode e2 = Expression(); - parameters.add(e2); - } - } - result = parameters.toArray(new TypedNode[parameters.size()]); - Expect(7); - return result; - } - + void SimpleLanguage() { + Function(); + while (la.kind == 4) { + Function(); + } + } + + void Function() { + Expect(4); + factory.startFunction(); + Expect(1); + String name = t.val; + List parameterNames = new ArrayList<>(); + if (la.kind == 5) { + Get(); + if (la.kind == 1) { + Get(); + parameterNames.add(t.val); + } + while (la.kind == 6) { + Get(); + Expect(1); + parameterNames.add(t.val); + } + Expect(7); + } + StatementNode body = Block(); + factory.createFunction(body, name, parameterNames.toArray(new String[parameterNames.size()])); + } + + StatementNode Block() { + StatementNode result; + List statements = new ArrayList<>(); + Expect(8); + while (StartOf(1)) { + StatementNode statement = Statement(); + statements.add(statement); + } + Expect(9); + result = factory.createBlock(statements); + return result; + } + + StatementNode Statement() { + StatementNode result; + result = null; + if (la.kind == 13) { + result = WhileStatement(); + } else if (la.kind == 11) { + result = IfStatement(); + } else if (la.kind == 14) { + result = ReturnStatement(); + } else if (StartOf(2)) { + result = Expression(); + Expect(10); + } else SynErr(30); + return result; + } + + StatementNode WhileStatement() { + StatementNode result; + Expect(13); + Expect(5); + ConditionNode condition = Expression(); + Expect(7); + StatementNode body = Block(); + result = factory.createWhile(condition, body); + return result; + } + + StatementNode IfStatement() { + StatementNode result; + Expect(11); + Expect(5); + ConditionNode condition = Expression(); + Expect(7); + StatementNode thenNode = null; StatementNode elseNode = null; + thenNode = Block(); + if (la.kind == 12) { + Get(); + elseNode = Block(); + } + result = factory.createIf(condition, thenNode, elseNode); + return result; + } + + StatementNode ReturnStatement() { + StatementNode result; + Expect(14); + TypedNode value = Expression(); + Expect(10); + result = factory.createReturn(value); + return result; + } + + TypedNode Expression() { + TypedNode result; + result = ValueExpression(); + if (StartOf(3)) { + switch (la.kind) { + case 15: { + Get(); + break; + } + case 16: { + Get(); + break; + } + case 17: { + Get(); + break; + } + case 18: { + Get(); + break; + } + case 19: { + Get(); + break; + } + case 20: { + Get(); + break; + } + } + String op = t.val; + TypedNode right = ValueExpression(); + result = factory.createBinary(op, result, right); + } + return result; + } + + TypedNode ValueExpression() { + TypedNode result; + result = Term(); + while (la.kind == 21 || la.kind == 22) { + if (la.kind == 21) { + Get(); + } else { + Get(); + } + String op = t.val; + TypedNode right = Term(); + result = factory.createBinary(op, result, right); + } + return result; + } + + TypedNode Term() { + TypedNode result; + result = Factor(); + while (la.kind == 23 || la.kind == 24) { + if (la.kind == 23) { + Get(); + } else { + Get(); + } + String op = t.val; + TypedNode right = Factor(); + result = factory.createBinary(op, result, right); + } + return result; + } + + TypedNode Factor() { + TypedNode result; + result = null; + if (la.kind == 1) { + result = VariableRefOrCall(); + } else if (la.kind == 2) { + result = StringLiteral(); + } else if (la.kind == 3) { + result = NumericLiteral(); + } else if (la.kind == 25) { + result = Ternary(); + } else if (la.kind == 5) { + Get(); + result = Expression(); + Expect(7); + } else SynErr(31); + return result; + } + + TypedNode VariableRefOrCall() { + TypedNode result; + result = VariableRef(); + if (la.kind == 5 || la.kind == 28) { + if (la.kind == 5) { + TypedNode[] parameters = Parameters(); + result = factory.createCall(result, parameters); + } else { + Get(); + TypedNode assignment = Expression(); + result = factory.createAssignment(result, assignment); + } + } + return result; + } + + TypedNode StringLiteral() { + TypedNode result; + Expect(2); + result = factory.createStringLiteral(t.val.substring(1, t.val.length() - 1)); + return result; + } + + TypedNode NumericLiteral() { + TypedNode result; + Expect(3); + result = factory.createNumericLiteral(t.val); + return result; + } + + TypedNode Ternary() { + TypedNode result; + TypedNode condition, thenPart, elsePart; + Expect(25); + condition = Expression(); + Expect(26); + thenPart = Expression(); + Expect(27); + elsePart = Expression(); + result = factory.createTernary(condition, thenPart, elsePart); + return result; + } + + TypedNode VariableRef() { + TypedNode result; + Expect(1); + result = factory.createLocal(t.val); + return result; + } + + TypedNode[] Parameters() { + TypedNode[] result; + Expect(5); + List parameters = new ArrayList<>(); + if (StartOf(2)) { + TypedNode e1 = Expression(); + parameters.add(e1); + while (la.kind == 6) { + Get(); + TypedNode e2 = Expression(); + parameters.add(e2); + } + } + result = parameters.toArray(new TypedNode[parameters.size()]); + Expect(7); + return result; + } + public void Parse() { la = new Token(); la.val = ""; Get(); - SimpleLanguage(); - Expect(0); + SimpleLanguage(); + Expect(0); } private static final boolean[][] set = { - {T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x}, - {x,T,T,T, x,T,x,x, x,x,x,T, x,T,T,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x}, - {x,T,T,T, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x}, - {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,T,T,T, T,x,x,x, x,x,x,x, x,x,x} + {T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x}, + {x,T,T,T, x,T,x,x, x,x,x,T, x,T,T,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x}, + {x,T,T,T, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,T,T,T, T,x,x,x, x,x,x,x, x,x,x} }; @@ -436,38 +435,38 @@ public void SynErr(int line, int col, int n) { String s; - switch (n) { - case 0: s = "EOF expected"; break; - case 1: s = "identifier expected"; break; - case 2: s = "stringLiteral expected"; break; - case 3: s = "numericLiteral expected"; break; - case 4: s = "\"function\" expected"; break; - case 5: s = "\"(\" expected"; break; - case 6: s = "\",\" expected"; break; - case 7: s = "\")\" expected"; break; - case 8: s = "\"{\" expected"; break; - case 9: s = "\"}\" expected"; break; - case 10: s = "\";\" expected"; break; - case 11: s = "\"if\" expected"; break; - case 12: s = "\"else\" expected"; break; - case 13: s = "\"while\" expected"; break; - case 14: s = "\"return\" expected"; break; - case 15: s = "\"<\" expected"; break; - case 16: s = "\">\" expected"; break; - case 17: s = "\"<=\" expected"; break; - case 18: s = "\">=\" expected"; break; - case 19: s = "\"==\" expected"; break; - case 20: s = "\"!=\" expected"; break; - case 21: s = "\"+\" expected"; break; - case 22: s = "\"-\" expected"; break; - case 23: s = "\"*\" expected"; break; - case 24: s = "\"/\" expected"; break; - case 25: s = "\"#\" expected"; break; - case 26: s = "\"?\" expected"; break; - case 27: s = "\":\" expected"; break; - case 28: s = "\"=\" expected"; break; - case 29: s = "??? expected"; break; - case 30: s = "invalid Statement"; break; + switch (n) { + case 0: s = "EOF expected"; break; + case 1: s = "identifier expected"; break; + case 2: s = "stringLiteral expected"; break; + case 3: s = "numericLiteral expected"; break; + case 4: s = "\"function\" expected"; break; + case 5: s = "\"(\" expected"; break; + case 6: s = "\",\" expected"; break; + case 7: s = "\")\" expected"; break; + case 8: s = "\"{\" expected"; break; + case 9: s = "\"}\" expected"; break; + case 10: s = "\";\" expected"; break; + case 11: s = "\"if\" expected"; break; + case 12: s = "\"else\" expected"; break; + case 13: s = "\"while\" expected"; break; + case 14: s = "\"return\" expected"; break; + case 15: s = "\"<\" expected"; break; + case 16: s = "\">\" expected"; break; + case 17: s = "\"<=\" expected"; break; + case 18: s = "\">=\" expected"; break; + case 19: s = "\"==\" expected"; break; + case 20: s = "\"!=\" expected"; break; + case 21: s = "\"+\" expected"; break; + case 22: s = "\"-\" expected"; break; + case 23: s = "\"*\" expected"; break; + case 24: s = "\"/\" expected"; break; + case 25: s = "\"#\" expected"; break; + case 26: s = "\"?\" expected"; break; + case 27: s = "\":\" expected"; break; + case 28: s = "\"=\" expected"; break; + case 29: s = "??? expected"; break; + case 30: s = "invalid Statement"; break; case 31: s = "invalid Factor"; break; default: s = "error " + n; diff -r 53f8adcbc474 -r 7311354f5bf8 graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/Scanner.java --- a/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/Scanner.java Mon Nov 11 21:40:18 2013 +0100 +++ b/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/Scanner.java Mon Nov 11 21:43:03 2013 +0100 @@ -21,8 +21,7 @@ * questions. */ - // The content of this file is automatically generated. DO NOT EDIT. - +// The content of this file is automatically generated. DO NOT EDIT. package com.oracle.truffle.sl.parser; @@ -312,8 +311,8 @@ static final char EOL = '\n'; static final int eofSym = 0; - static final int maxT = 29; - static final int noSym = 29; + static final int maxT = 29; + static final int noSym = 29; public Buffer buffer; // scanner buffer @@ -337,34 +336,34 @@ static { start = new StartStates(); literals = new HashMap(); - for (int i = 65; i <= 90; ++i) start.set(i, 1); - for (int i = 97; i <= 122; ++i) start.set(i, 1); - for (int i = 49; i <= 57; ++i) start.set(i, 4); - start.set(34, 2); - start.set(48, 5); - start.set(40, 6); - start.set(44, 7); - start.set(41, 8); - start.set(123, 9); - start.set(125, 10); - start.set(59, 11); - start.set(60, 24); - start.set(62, 25); - start.set(61, 26); - start.set(33, 15); - start.set(43, 17); - start.set(45, 18); - start.set(42, 19); - start.set(47, 20); - start.set(35, 21); - start.set(63, 22); - start.set(58, 23); - start.set(Buffer.EOF, -1); - literals.put("function", new Integer(4)); - literals.put("if", new Integer(11)); - literals.put("else", new Integer(12)); - literals.put("while", new Integer(13)); - literals.put("return", new Integer(14)); + for (int i = 65; i <= 90; ++i) start.set(i, 1); + for (int i = 97; i <= 122; ++i) start.set(i, 1); + for (int i = 49; i <= 57; ++i) start.set(i, 4); + start.set(34, 2); + start.set(48, 5); + start.set(40, 6); + start.set(44, 7); + start.set(41, 8); + start.set(123, 9); + start.set(125, 10); + start.set(59, 11); + start.set(60, 24); + start.set(62, 25); + start.set(61, 26); + start.set(33, 15); + start.set(43, 17); + start.set(45, 18); + start.set(42, 19); + start.set(47, 20); + start.set(35, 21); + start.set(63, 22); + start.set(58, 23); + start.set(Buffer.EOF, -1); + literals.put("function", new Integer(4)); + literals.put("if", new Integer(11)); + literals.put("else", new Integer(12)); + literals.put("while", new Integer(13)); + literals.put("return", new Integer(14)); } @@ -430,53 +429,53 @@ tval = newBuf; } if (ch != Buffer.EOF) { - tval[tlen++] = (char)ch; + tval[tlen++] = (char)ch; NextCh(); } } - - boolean Comment0() { - int level = 1, pos0 = pos, line0 = line, col0 = col, charPos0 = charPos; - NextCh(); - if (ch == '/') { - NextCh(); - for(;;) { - if (ch == 10) { - level--; - if (level == 0) { oldEols = line - line0; NextCh(); return true; } - NextCh(); - } else if (ch == Buffer.EOF) return false; - else NextCh(); - } - } else { - buffer.setPos(pos0); NextCh(); line = line0; col = col0; charPos = charPos0; - } - return false; - } - - boolean Comment1() { - int level = 1, pos0 = pos, line0 = line, col0 = col, charPos0 = charPos; - NextCh(); - if (ch == '*') { - NextCh(); - for(;;) { - if (ch == '*') { - NextCh(); - if (ch == '/') { - level--; - if (level == 0) { oldEols = line - line0; NextCh(); return true; } - NextCh(); - } - } else if (ch == Buffer.EOF) return false; - else NextCh(); - } - } else { - buffer.setPos(pos0); NextCh(); line = line0; col = col0; charPos = charPos0; - } - return false; - } + + boolean Comment0() { + int level = 1, pos0 = pos, line0 = line, col0 = col, charPos0 = charPos; + NextCh(); + if (ch == '/') { + NextCh(); + for(;;) { + if (ch == 10) { + level--; + if (level == 0) { oldEols = line - line0; NextCh(); return true; } + NextCh(); + } else if (ch == Buffer.EOF) return false; + else NextCh(); + } + } else { + buffer.setPos(pos0); NextCh(); line = line0; col = col0; charPos = charPos0; + } + return false; + } + + boolean Comment1() { + int level = 1, pos0 = pos, line0 = line, col0 = col, charPos0 = charPos; + NextCh(); + if (ch == '*') { + NextCh(); + for(;;) { + if (ch == '*') { + NextCh(); + if (ch == '/') { + level--; + if (level == 0) { oldEols = line - line0; NextCh(); return true; } + NextCh(); + } + } else if (ch == Buffer.EOF) return false; + else NextCh(); + } + } else { + buffer.setPos(pos0); NextCh(); line = line0; col = col0; charPos = charPos0; + } + return false; + } void CheckLiteral() { @@ -518,71 +517,71 @@ t.kind = recKind; break loop; } // NextCh already done - case 1: - recEnd = pos; recKind = 1; + case 1: + recEnd = pos; recKind = 1; if (ch >= '0' && ch <= '9' || ch >= 'A' && ch <= 'Z' || ch >= 'a' && ch <= 'z') {AddCh(); state = 1; break;} - else {t.kind = 1; t.val = new String(tval, 0, tlen); CheckLiteral(); return t;} - case 2: + else {t.kind = 1; t.val = new String(tval, 0, tlen); CheckLiteral(); return t;} + case 2: if (ch <= 9 || ch >= 11 && ch <= 12 || ch >= 14 && ch <= '!' || ch >= '#' && ch <= '[' || ch >= ']' && ch <= 65535) {AddCh(); state = 2; break;} else if (ch == '"') {AddCh(); state = 3; break;} - else {state = 0; break;} + else {state = 0; break;} case 3: - {t.kind = 2; break loop;} - case 4: - recEnd = pos; recKind = 3; + {t.kind = 2; break loop;} + case 4: + recEnd = pos; recKind = 3; if (ch >= '0' && ch <= '9') {AddCh(); state = 4; break;} - else {t.kind = 3; break loop;} + else {t.kind = 3; break loop;} case 5: - {t.kind = 3; break loop;} + {t.kind = 3; break loop;} case 6: - {t.kind = 5; break loop;} + {t.kind = 5; break loop;} case 7: - {t.kind = 6; break loop;} + {t.kind = 6; break loop;} case 8: - {t.kind = 7; break loop;} + {t.kind = 7; break loop;} case 9: - {t.kind = 8; break loop;} + {t.kind = 8; break loop;} case 10: - {t.kind = 9; break loop;} + {t.kind = 9; break loop;} case 11: - {t.kind = 10; break loop;} + {t.kind = 10; break loop;} case 12: - {t.kind = 17; break loop;} + {t.kind = 17; break loop;} case 13: - {t.kind = 18; break loop;} + {t.kind = 18; break loop;} case 14: - {t.kind = 19; break loop;} - case 15: + {t.kind = 19; break loop;} + case 15: if (ch == '=') {AddCh(); state = 16; break;} - else {state = 0; break;} + else {state = 0; break;} case 16: - {t.kind = 20; break loop;} + {t.kind = 20; break loop;} case 17: - {t.kind = 21; break loop;} + {t.kind = 21; break loop;} case 18: - {t.kind = 22; break loop;} + {t.kind = 22; break loop;} case 19: - {t.kind = 23; break loop;} + {t.kind = 23; break loop;} case 20: - {t.kind = 24; break loop;} + {t.kind = 24; break loop;} case 21: - {t.kind = 25; break loop;} + {t.kind = 25; break loop;} case 22: - {t.kind = 26; break loop;} + {t.kind = 26; break loop;} case 23: - {t.kind = 27; break loop;} - case 24: - recEnd = pos; recKind = 15; + {t.kind = 27; break loop;} + case 24: + recEnd = pos; recKind = 15; if (ch == '=') {AddCh(); state = 12; break;} - else {t.kind = 15; break loop;} - case 25: - recEnd = pos; recKind = 16; + else {t.kind = 15; break loop;} + case 25: + recEnd = pos; recKind = 16; if (ch == '=') {AddCh(); state = 13; break;} - else {t.kind = 16; break loop;} - case 26: - recEnd = pos; recKind = 28; + else {t.kind = 16; break loop;} + case 26: + recEnd = pos; recKind = 28; if (ch == '=') {AddCh(); state = 14; break;} - else {t.kind = 28; break loop;} + else {t.kind = 28; break loop;} } }