Skip to content

Commit be6c203

Browse files
committed
another review fix
1 parent 8ca79c5 commit be6c203

2 files changed

Lines changed: 3 additions & 14 deletions

File tree

de.peeeq.wurstscript/src/main/antlr/de/peeeq/wurstscript/antlr/Wurst.g4

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -447,21 +447,17 @@ typeArgs: ('<' (args+=typeExpr (',' args+=typeExpr)*)? '>')?;
447447
typeArgsNonEmpty: '<' args+=typeExpr (',' args+=typeExpr)* '>';
448448

449449
genericTypeReceiver:
450-
receiverTypePrefixes+=genericTypeReceiverPrefixPart* receiverTypeGenericPart=genericTypeReceiverGenericPart receiverTypeSuffixes+=genericTypeReceiverSuffixPart*
450+
receiverTypePrefixes+=genericTypeReceiverPrefixPart* receiverTypeGenericPart=genericTypeReceiverGenericPart
451451
;
452452

453453
genericTypeReceiverPrefixPart:
454-
typeName=ID typeArgs '.'
454+
typeName=ID '.'
455455
;
456456

457457
genericTypeReceiverGenericPart:
458458
typeName=ID typeArgsNonEmpty
459459
;
460460

461-
genericTypeReceiverSuffixPart:
462-
'.' typeName=ID typeArgs
463-
;
464-
465461
exprList : exprs+=expr (',' exprs+=expr)*;
466462

467463

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/parser/antlr/AntlrWurstParseTreeTransformer.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1136,20 +1136,13 @@ private TypeExpr transformGenericTypeReceiver(GenericTypeReceiverContext receive
11361136

11371137
for (GenericTypeReceiverPrefixPartContext part : receiverType.receiverTypePrefixes) {
11381138
result = Ast.TypeExprSimple(source(part.typeName), scopeType,
1139-
part.typeName.getText(), transformTypeArgs(part.typeArgs()));
1139+
part.typeName.getText(), Ast.TypeExprList());
11401140
scopeType = result;
11411141
}
11421142

11431143
GenericTypeReceiverGenericPartContext genericPart = receiverType.receiverTypeGenericPart;
11441144
result = Ast.TypeExprSimple(source(genericPart.typeName), scopeType,
11451145
genericPart.typeName.getText(), transformTypeArgs(genericPart.typeArgsNonEmpty()));
1146-
scopeType = result;
1147-
1148-
for (GenericTypeReceiverSuffixPartContext part : receiverType.receiverTypeSuffixes) {
1149-
result = Ast.TypeExprSimple(source(part.typeName), scopeType,
1150-
part.typeName.getText(), transformTypeArgs(part.typeArgs()));
1151-
scopeType = result;
1152-
}
11531146

11541147
return result;
11551148
}

0 commit comments

Comments
 (0)