From 3fec24fbe9ef932c43e8be3e48385c1bcd91bbb3 Mon Sep 17 00:00:00 2001 From: Bernhard Rumpe Date: Thu, 3 Oct 2024 10:18:43 +0200 Subject: [PATCH] BR --- .../src/main/grammars/de/monticore/Grammars.md | 15 ++++++--------- .../de/monticore/types/TypeParameters.mc4 | 3 ++- .../src/main/grammars/de/monticore/types/Types.md | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/monticore-grammar/src/main/grammars/de/monticore/Grammars.md b/monticore-grammar/src/main/grammars/de/monticore/Grammars.md index 9a32c0e295..85efd1f6eb 100644 --- a/monticore-grammar/src/main/grammars/de/monticore/Grammars.md +++ b/monticore-grammar/src/main/grammars/de/monticore/Grammars.md @@ -188,15 +188,12 @@ the chosen typecheck wants to enforce explicit coercion. ### [TypeParameters.mc4](types/TypeParameters.mc4) (alpha) -This grammar offers ways to define type parameters for, -e.g., classes or functions. -Modeling elements with type parameters represent -type-level functions that take type arguments; -For Example, the generic type `List` has one type parameter `T` -and therefore takes one type argument. -`List` or `List` cannot be used directly in a model, -instead, providing a type argument (e.g., `int`) -yields a type `List` that can be used. +This grammar defines type parameters for, +e.g., classes or functions, such as ``, ``, +`T extends Person`, `U extends T & Comparable`. +Modeling elements with type parameters therefore take type arguments. +For example, the generic type `List` has the type parameter `T` +allowing to use the type `List`. ## Symbols: List of Grammars in package `de.monticore.symbols` diff --git a/monticore-grammar/src/main/grammars/de/monticore/types/TypeParameters.mc4 b/monticore-grammar/src/main/grammars/de/monticore/types/TypeParameters.mc4 index 2ef5628a26..bd19e086d6 100644 --- a/monticore-grammar/src/main/grammars/de/monticore/types/TypeParameters.mc4 +++ b/monticore-grammar/src/main/grammars/de/monticore/types/TypeParameters.mc4 @@ -1,7 +1,8 @@ /* (c) https://github.com/MontiCore/monticore */ package de.monticore.types; -/* Beta-version: This is intended to become a MontiCore stable grammar. */ +/* This is a MontiCore stable grammar. + * Adaptations -- if any -- are conservative. */ import de.monticore.symbols.BasicSymbols; diff --git a/monticore-grammar/src/main/grammars/de/monticore/types/Types.md b/monticore-grammar/src/main/grammars/de/monticore/types/Types.md index 79f369b951..cb61d13af4 100644 --- a/monticore-grammar/src/main/grammars/de/monticore/types/Types.md +++ b/monticore-grammar/src/main/grammars/de/monticore/types/Types.md @@ -74,7 +74,7 @@ The resulting Symbols can than be used with, e.g., [`MCSimpleGenericTypes`](MCSimpleGenericTypes.mc4), or [`MCFullGenericTypes`](MCFullGenericTypes.mc4) to define types by providing the corresponding type arguments. -Additionally, type parameters may optionally have upper bounds, +Type parameters may optionally have upper bounds, e.g., `T extends Person`, `U extends T & Comparable`. ## [`MCArrayTypes`](MCArrayTypes.mc4)