Skip to content

Commit

Permalink
Use minimum and maximum instead of minimal and maximal
Browse files Browse the repository at this point in the history
  • Loading branch information
ThomasMertes committed Jan 13, 2024
1 parent 9369c0b commit b7e7a56
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions lib/bitmapfont.s7i
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,9 @@ const proc: setFont (inout pixmapFontFile: fontFile, in bitmapFont: aFont) is fu


(**
* Determine the maximal column width of all chars in a ''fontPicType''.
* Determine the maximum column width of all chars in a ''fontPicType''.
* This is used as helper function when a font is defined.
* @return the maximal column width of all chars in ''fontPictures''.
* @return the maximum column width of all chars in ''fontPictures''.
*)
const func integer: columnWidth (in fontPicType: fontPictures) is func
result
Expand Down
8 changes: 4 additions & 4 deletions lib/bitset.s7i
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ const func integer: rand (in bitset: aSet) is action "SET_R


(**
* Minimal element of a set.
* Minimum element of a set.
* Delivers the element from ''aSet'' for which the following condition holds:
* element <= X
* for all X which are in the set.
Expand All @@ -278,20 +278,20 @@ const func integer: min (in bitset: aSet) is action "SET_M


(**
* Maximal element of a set.
* Maximum element of a set.
* Delivers the element from ''aSet'' for which the following condition holds:
* element >= X
* for all X which are in the set.
* max({2, 3, 5, 7, 11}) returns 11
* max(EMPTY_SET) raises RANGE_ERROR
* @return the maximal element of ''aSet''.
* @return the maximum element of ''aSet''.
* @exception RANGE_ERROR If ''aSet'' is the empty set.
*)
const func integer: max (in bitset: aSet) is action "SET_MAX";


(**
* Minimal element of ''aSet'' that is larger than ''number''.
* Minimum element of ''aSet'' that is larger than ''number''.
* next({2, 3, 5, 7, 11}, 2) returns 3
* next({2, 3, 5, 7, 11}, 3) returns 5
* next({2, 3, 5, 7, 11}, 7) returns 11
Expand Down
8 changes: 4 additions & 4 deletions lib/bitsetof.s7i
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ const func type: bitset (in type: baseType) is func
return baseType conv rand(bitset(aSet));

(**
* Minimal element of a set.
* Minimum element of a set.
* Delivers the element from ''aSet'' for which the following condition holds:
* element <= X
* for all X which are in the set.
Expand All @@ -273,19 +273,19 @@ const func type: bitset (in type: baseType) is func
return baseType conv min(bitset(aSet));

(**
* Maximal element of a set.
* Maximum element of a set.
* Delivers the element from ''aSet'' for which the following condition holds:
* element >= X
* for all X which are in the set.
* max({'a', 'b', 'c'}) returns 'c'
* @return the maximal element of ''aSet''.
* @return the maximum element of ''aSet''.
* @exception RANGE_ERROR If ''aSet'' is the empty set.
*)
const func baseType: max (in setType: aSet) is
return baseType conv max(bitset(aSet));

(**
* Minimal element of ''aSet'' that is larger than ''number''.
* Minimum element of ''aSet'' that is larger than ''number''.
* @return the minimum element of ''aSet'' that is larger than ''number''.
* @exception RANGE_ERROR If ''aSet'' has no element larger than ''number''.
*)
Expand Down
8 changes: 4 additions & 4 deletions lib/font.s7i
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ const func integer: baseLineDelta (in font: aFont) is DYNAMIC;


(**
* Get the maximal column width of a font.
* The width of all chars in a font is checked to get the maximal
* column width. The maximal column width is measured in pixels.
* @return the maximal column width of ''aFont''.
* Get the maximum column width of a font.
* The width of all chars in a font is checked to get the maximum
* column width. The maximum column width is measured in pixels.
* @return the maximum column width of ''aFont''.
*)
const func integer: columnWidth (in font: aFont) is DYNAMIC;

Expand Down
16 changes: 8 additions & 8 deletions lib/idxarray.s7i
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,16 @@ const func type: array [ (in type: indexType) ] (in type: baseType) is func
const func integer: length (in arrayType: arr) is action "ARR_LNG";

(**
* Minimal index of array ''arr'' converted to [[integer]].
* Minimum index of array ''arr'' converted to [[integer]].
* minIntIdx(['a'] (1, 2, 3)) returns 97
* @return the minimal index of the array converted to [[integer]].
* @return the minimum index of the array converted to [[integer]].
*)
const func integer: minIntIdx (in arrayType: arr) is action "ARR_MINIDX";

(**
* Maximal index of array ''arr'' converted to [[integer]].
* Maximum index of array ''arr'' converted to [[integer]].
* maxIntIdx(['a'] (1, 2, 3)) returns 99
* @return the maximal index of the array converted to [[integer]].
* @return the maximum index of the array converted to [[integer]].
*)
const func integer: maxIntIdx (in arrayType: arr) is action "ARR_MAXIDX";

Expand Down Expand Up @@ -155,17 +155,17 @@ const func type: array [ (in type: indexType) ] (in type: baseType) is func
return arrayType conv (stdArrayType conv an_array[ord(start) len ord(stop)]);

(**
* Minimal index of array ''arr''.
* Minimum index of array ''arr''.
* minIdx(['a'] (1, 2, 3)) returns 'a'
* @return the minimal index of the array.
* @return the minimum index of the array.
*)
const func indexType: minIdx (in arrayType: arr) is
return indexType conv minIntIdx(arr);

(**
* Maximal index of array ''arr''.
* Maximum index of array ''arr''.
* maxIdx(['a'] (1, 2, 3)) returns 'c'
* @return the maximal index of the array.
* @return the maximum index of the array.
*)
const func indexType: maxIdx (in arrayType: arr) is
return indexType conv maxIntIdx(arr);
Expand Down
4 changes: 2 additions & 2 deletions lib/vectorfont.s7i
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,9 @@ const proc: incl (inout fontVectorType: fontVectors, in char: ch, in integer: wi


(**
* Determine the maximal column width of all chars in a ''fontVectorType''.
* Determine the maximum column width of all chars in a ''fontVectorType''.
* This is used as helper function when a font is defined.
* @return the maximal column width of all chars in ''fontVectorType''.
* @return the maximum column width of all chars in ''fontVectorType''.
*)
const func integer: columnWidth (in fontVectorType: fontVectors) is func
result
Expand Down

0 comments on commit b7e7a56

Please sign in to comment.