From b7ca486683449d2ff997327d4ffbb90f2a6969e4 Mon Sep 17 00:00:00 2001 From: eiffel-org Date: Wed, 11 Sep 2019 18:53:32 +0000 Subject: [PATCH] Expanded if/then/elseif/end to include conditional expressions https://www.eiffel.org/doc/eiffel/Conditional_expression Updated wikipage Eiffel programming language reserved words. (Signed-off-by:RTH10260). git-svn-id: https://svn.eiffel.com/eiffel-org/trunk@2184 abb3cda0-5349-4a8f-a601-0c33ac3a8c38 --- ...l-programming-language-reserved-words.wiki | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/documentation/19.05/eiffel/Language_reference/quick-reference-eiffel-programming-language/eiffel-programming-language-reserved-words.wiki b/documentation/19.05/eiffel/Language_reference/quick-reference-eiffel-programming-language/eiffel-programming-language-reserved-words.wiki index cad8eced..db3328cf 100644 --- a/documentation/19.05/eiffel/Language_reference/quick-reference-eiffel-programming-language/eiffel-programming-language-reserved-words.wiki +++ b/documentation/19.05/eiffel/Language_reference/quick-reference-eiffel-programming-language/eiffel-programming-language-reserved-words.wiki @@ -1,4 +1,4 @@ -[[Property:modification_date|Wed, 11 Sep 2019 16:20:54 GMT]] +[[Property:modification_date|Wed, 11 Sep 2019 18:53:32 GMT]] [[Property:publication_date|Wed, 11 Sep 2019 14:10:27 GMT]] [[Property:title|Eiffel programming language reserved words]] [[Property:link_title|Reserved words]] @@ -160,6 +160,10 @@ Used in [[ET-_Instructions#Conditional|conditional]] and [[ET-_Instructions#Mult :[[Eiffel programming language syntax#Multi-branch instructions|Multi-branch syntax.]] +Used in a [[Conditional_expression|conditional expression]] to compute a value in the case that no specified conditions are met. + +:[[Eiffel programming language syntax#Conditionals|Conditional expression syntax.]] + Used as part of the double reserved word or else, the semi-strict disjunction operator. :[[Eiffel programming language syntax#Operators|Syntax.]] @@ -175,6 +179,10 @@ Used in [[ET-_Instructions#Conditional|conditional]] instructions to effect a "m :[[Eiffel programming language syntax#Conditionals|Syntax.]] +Used in a [[Conditional_expression|conditional expression]] to effect a "multi-branch" choice to compute of a value. + +:[[Eiffel programming language syntax#Conditionals|Conditional expression syntax.]] + ===end=== @@ -188,6 +196,7 @@ Serves to terminate several Eiffel programming language constructs. ::[[Eiffel programming language syntax#Generic constraints|Generic constraints: renaming and constraint creators]] ::[[Eiffel programming language syntax#Conditionals|Conditional instructions]] ::[[Eiffel programming language syntax#Multi-branch instructions|Multi-branch instructions]] +::[[Eiffel programming language syntax#Conditionals|Conditional expressions]] ::[[Eiffel programming language syntax#Loops|Loops]] ::[[Eiffel programming language syntax#Debug instructions|Debug instructions]] @@ -260,9 +269,13 @@ Used with a formal generic parameter to indicate that conformance of generic der ===if=== -Introduces a [[ET-_Instructions#Conditional|conditional]]. +Used to introduce a [[ET-_Instructions#Conditional|conditional]]. -:[[Eiffel programming language syntax#Conditionals|Syntax.]] +:[[Eiffel programming language syntax#Conditionals|Conditional syntax.]] + +Used to introduce a [[Conditional_expression|Conditional expression]]. + +:[[Eiffel programming language syntax#Conditionals|Conditional expression syntax.]] ===implies=== @@ -445,6 +458,10 @@ Used in [[ET-_Instructions#Conditional|conditional]] and [[ET-_Instructions#Mult :[[Eiffel programming language syntax#Multi-branch instructions|Multi-branch syntax.]] +Used in a [[Conditional_expression|conditional expression]] to compute of a value in the case that a condition is met. + +:[[Eiffel programming language syntax#Conditionals|Conditional expression syntax.]] + Used as part of the double reserved word and then, the semi-strict conjunction operator. :[[Eiffel programming language syntax#Operators|Syntax.]]