Merge remote-tracking branch 'origin/master'

This commit is contained in:
Krauß, Josefine 2024-05-14 11:32:40 +02:00
commit c3a9b9a7d6

View File

@ -21,7 +21,7 @@ subExpression: This | assignableExpr | stmtExpr | OpenRoundBracket subExpression
//.trim().toLength().toLowerCase().count ... //.trim().toLength().toLowerCase().count ...
methodCall: receiver? receivingMethod* Identifier OpenRoundBracket argumentList ClosedRoundBracket; methodCall: receiver? receivingMethod* Identifier OpenRoundBracket argumentList ClosedRoundBracket;
statement: returnStmt Semicolon | localVarDecl Semicolon | block | whileStmt | ifElseStmt | stmtExpr Semicolon; statement: returnStmt Semicolon | localVarDecl | block | whileStmt | ifElseStmt | stmtExpr Semicolon | emptyStatement;
stmtExpr: assign | newDecl | methodCall; stmtExpr: assign | newDecl | methodCall;
@ -29,7 +29,7 @@ assignableExpr: Identifier | instVar;
subReceiver: ((This | newDecl | Identifier) Dot); subReceiver: ((This | newDecl | Identifier) Dot);
instVar: subReceiver? receivingMethod* Identifier; instVar: subReceiver+ receivingMethod* Identifier;
binaryExpr: calcExpr | nonCalcExpr| value | Not binaryExpr; binaryExpr: calcExpr | nonCalcExpr| value | Not binaryExpr;
@ -53,7 +53,7 @@ assign: assignableExpr Assign expression;
newDecl: New Identifier OpenRoundBracket argumentList ClosedRoundBracket; newDecl: New Identifier OpenRoundBracket argumentList ClosedRoundBracket;
receiver: ((This | instVar | newDecl | Identifier) Dot); receiver: ((This | instVar | newDecl | Identifier) Dot);
receivingMethod: Identifier OpenRoundBracket argumentList ClosedRoundBracket Dot; receivingMethod: Identifier OpenRoundBracket argumentList ClosedRoundBracket Dot;
emptyStatement : Semicolon;
type: Int | Boolean | Char | Identifier; type: Int | Boolean | Char | Identifier;
value: IntValue | BooleanValue | CharValue | NullValue; value: IntValue | BooleanValue | CharValue | NullValue;