From 7c55ee78dc490f5f96f32c40eeaa6acd3239f1eb Mon Sep 17 00:00:00 2001 From: Jeremie Gillet Date: Mon, 9 Dec 2024 10:46:16 +0900 Subject: [PATCH 1/3] remove mention of unless in docs-type files --- concepts/if/about.md | 17 +++-------------- concepts/if/introduction.md | 4 ++-- concepts/if/links.json | 6 +----- exercises/concept/name-badge/.docs/hints.md | 6 +++--- .../concept/name-badge/.docs/introduction.md | 4 ++-- exercises/concept/name-badge/.meta/design.md | 2 +- .../practice/leap/.approaches/flow/content.md | 4 ++-- 7 files changed, 14 insertions(+), 29 deletions(-) diff --git a/concepts/if/about.md b/concepts/if/about.md index 3279d6a812..aa8aae4a99 100644 --- a/concepts/if/about.md +++ b/concepts/if/about.md @@ -1,8 +1,8 @@ # About -Besides `cond`, Elixir also provides the macros [`if/2` and `unless/2`][getting-started-if-unless] which are useful when you need to check for only one condition. +Besides `cond`, Elixir also provides the macro [`if/2`][getting-started-if] which is useful when you need to check for only one condition. -[`if/2`][kernel-if] accepts a condition and two options. It returns the first option if the condition is _truthy_, and the second option if the condition is _falsy_. [`unless/2`][kernel-unless] does the opposite. +[`if/2`][kernel-if] accepts a condition and two options. It returns the first option if the condition is _truthy_, and the second option if the condition is _falsy_. ```elixir age = 15 @@ -36,16 +36,6 @@ if age >= 16, do: "beer", else: "no beer" This syntax is helpful for very short expressions, but should be avoided if the expression won't fit on a single line. -`unless` with an `else` option should be avoided. - -```elixir -# preferred -if age >= 16, do: "beer", else: "no beer" - -# not preferred -unless age < 16, do: "no beer", else: "beer" -``` - ## _Truthy_ and _falsy_ In Elixir, all datatypes evaluate to a _truthy_ or _falsy_ value when they are encountered in a boolean context (like an `if` expression). All data is considered _truthy_ **except** for `false` and `nil`. In particular, empty strings, the integer `0`, and empty lists are all considered _truthy_ in Elixir. In this way, [Elixir is similar to Ruby but different than JavaScript, Python, or PHP][falsy-various-langs]. @@ -76,9 +66,8 @@ truthy?.(nil) # => true ``` -[getting-started-if-unless]: https://hexdocs.pm/elixir/case-cond-and-if.html#if-unless +[getting-started-if]: https://hexdocs.pm/elixir/case-cond-and-if.html#if-unless [kernel-if]: https://hexdocs.pm/elixir/Kernel.html#if/2 -[kernel-unless]: https://hexdocs.pm/elixir/Kernel.html#unless/2 [kernel-boolean-and]: https://hexdocs.pm/elixir/Kernel.html#and/2 [kernel-boolean-or]: https://hexdocs.pm/elixir/Kernel.html#or/2 [kernel-boolean-not]: https://hexdocs.pm/elixir/Kernel.html#not/1 diff --git a/concepts/if/introduction.md b/concepts/if/introduction.md index 5c97f8bf43..b40fc84531 100644 --- a/concepts/if/introduction.md +++ b/concepts/if/introduction.md @@ -1,6 +1,6 @@ # Introduction -Besides `cond`, Elixir also provides the macro [`if/2`][getting-started-if-unless] which is useful when you need to check for only one condition. +Besides `cond`, Elixir also provides the macro [`if/2`][getting-started-if] which is useful when you need to check for only one condition. [`if/2`][kernel-if] accepts a condition and two options. It returns the first option if the condition is _truthy_, and the second option if the condition is _falsy_. @@ -28,5 +28,5 @@ This syntax is helpful for very short expressions, but should be avoided if the In Elixir, all datatypes evaluate to a _truthy_ or _falsy_ value when they are encountered in a boolean context (like an `if` expression). All data is considered _truthy_ **except** for `false` and `nil`. In particular, empty strings, the integer `0`, and empty lists are all considered _truthy_ in Elixir. -[getting-started-if-unless]: https://hexdocs.pm/elixir/case-cond-and-if.html#if-unless +[getting-started-if]: https://hexdocs.pm/elixir/case-cond-and-if.html#if-unless [kernel-if]: https://hexdocs.pm/elixir/Kernel.html#if/2 diff --git a/concepts/if/links.json b/concepts/if/links.json index e470f10bae..08d0f5306d 100644 --- a/concepts/if/links.json +++ b/concepts/if/links.json @@ -1,7 +1,7 @@ [ { "url": "https://hexdocs.pm/elixir/case-cond-and-if.html#if-unless", - "description": "Getting Started: `if` and `unless`" + "description": "Getting Started: `if`" }, { "url": "https://hexdocs.pm/elixir/basic-types.html#booleans-and-nil", @@ -10,9 +10,5 @@ { "url": "https://hexdocs.pm/elixir/Kernel.html#if/2", "description": "Documentation: `if/2`" - }, - { - "url": "https://hexdocs.pm/elixir/Kernel.html#unless/2", - "description": "Documentation: `unless/2`" } ] diff --git a/exercises/concept/name-badge/.docs/hints.md b/exercises/concept/name-badge/.docs/hints.md index 64d4caf866..a72b852aa4 100644 --- a/exercises/concept/name-badge/.docs/hints.md +++ b/exercises/concept/name-badge/.docs/hints.md @@ -2,7 +2,7 @@ ## General -- Read about `if` in the official [Getting Started guide][getting-started-if-unless] or on [elixirschool.com][elixirschool-if-unless]. +- Read about `if` in the official [Getting Started guide][getting-started-if] or on [elixirschool.com][elixirschool-if]. ## 1. Print a badge for an employee @@ -21,5 +21,5 @@ [kernel-if]: https://hexdocs.pm/elixir/Kernel.html#if/2 [getting-started-basic-strings]: https://hexdocs.pm/elixir/basic-types.html#strings -[getting-started-if-unless]: https://hexdocs.pm/elixir/case-cond-and-if.html#if-unless -[elixir-school-if-unless]: https://elixirschool.com/en/lessons/basics/control-structures/#if-and-unless +[getting-started-if]: https://hexdocs.pm/elixir/case-cond-and-if.html#if-unless +[elixirschool-if]: https://elixirschool.com/en/lessons/basics/control-structures/#if-and-unless diff --git a/exercises/concept/name-badge/.docs/introduction.md b/exercises/concept/name-badge/.docs/introduction.md index 815387aacb..adbabec9af 100644 --- a/exercises/concept/name-badge/.docs/introduction.md +++ b/exercises/concept/name-badge/.docs/introduction.md @@ -13,7 +13,7 @@ In other programming languages, `null` or `none` values might play a similar rol ## If -Besides `cond`, Elixir also provides the macro [`if/2`][getting-started-if-unless] which is useful when you need to check for only one condition. +Besides `cond`, Elixir also provides the macro [`if/2`][getting-started-if] which is useful when you need to check for only one condition. [`if/2`][kernel-if] accepts a condition and two options. It returns the first option if the condition is _truthy_, and the second option if the condition is _falsy_. @@ -42,5 +42,5 @@ This syntax is helpful for very short expressions, but should be avoided if the In Elixir, all datatypes evaluate to a _truthy_ or _falsy_ value when they are encountered in a boolean context (like an `if` expression). All data is considered _truthy_ **except** for `false` and `nil`. In particular, empty strings, the integer `0`, and empty lists are all considered _truthy_ in Elixir. [nil-dictionary]: https://www.merriam-webster.com/dictionary/nil -[getting-started-if-unless]: https://hexdocs.pm/elixir/case-cond-and-if.html#if-unless +[getting-started-if]: https://hexdocs.pm/elixir/case-cond-and-if.html#if-unless [kernel-if]: https://hexdocs.pm/elixir/Kernel.html#if/2 diff --git a/exercises/concept/name-badge/.meta/design.md b/exercises/concept/name-badge/.meta/design.md index 2a2ec5c24e..d09b1c0622 100644 --- a/exercises/concept/name-badge/.meta/design.md +++ b/exercises/concept/name-badge/.meta/design.md @@ -5,7 +5,7 @@ - Know what `nil` represents - Know that `nil` is a special atom - Know how to pattern match on `nil` -- Know how to use the `if`/`unless` macros +- Know how to use the `if` macro - Know about truthiness ## Out of scope diff --git a/exercises/practice/leap/.approaches/flow/content.md b/exercises/practice/leap/.approaches/flow/content.md index 02e9895bdc..16dd2e561e 100644 --- a/exercises/practice/leap/.approaches/flow/content.md +++ b/exercises/practice/leap/.approaches/flow/content.md @@ -15,9 +15,9 @@ end ## If -Elixir provides four [control flow structures][hexdocs-structures]: `case`, `cond`, `if`, and `unless`. +Elixir provides three [control flow structures][hexdocs-structures]: `case`, `cond`, `if`. -The `if` and `unless` allow to evaluate only one condition. +The `if` allows to evaluate only one condition. Unlike in many other languages, there is no `else if` option in Elixir. However, in this case, it is not necessary. We can use `if` once to check if the year is divisible by 100. From dbdcf5b06c0978b04e97c5e96d7a0fb771cb1fc7 Mon Sep 17 00:00:00 2001 From: Jeremie Gillet Date: Mon, 9 Dec 2024 10:49:08 +0900 Subject: [PATCH 2/3] do not use unless in example solutions --- exercises/practice/alphametics/.meta/example.ex | 2 +- exercises/practice/largest-series-product/.meta/example.ex | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/practice/alphametics/.meta/example.ex b/exercises/practice/alphametics/.meta/example.ex index 662570c206..dd78c79d70 100644 --- a/exercises/practice/alphametics/.meta/example.ex +++ b/exercises/practice/alphametics/.meta/example.ex @@ -35,7 +35,7 @@ defmodule Alphametics do Enum.find_value(numbers, fn number -> leading_zero? = number == 0 && letter in problem.first_letters - unless leading_zero? do + if !leading_zero? do numbers = List.delete(numbers, number) solution = put_in(solution[letter], number) solve(letters, numbers, solution, problem) diff --git a/exercises/practice/largest-series-product/.meta/example.ex b/exercises/practice/largest-series-product/.meta/example.ex index a3b2f9228d..35edca2e65 100644 --- a/exercises/practice/largest-series-product/.meta/example.ex +++ b/exercises/practice/largest-series-product/.meta/example.ex @@ -25,7 +25,7 @@ defmodule Series do end def largest_product(number_string, size) do - unless Enum.member?(Range.new(0, String.length(number_string)), size) do + if not Enum.member?(Range.new(0, String.length(number_string)), size) do raise ArgumentError end From d6f201e183fc6dd6dbb5e336407b35271d712d15 Mon Sep 17 00:00:00 2001 From: Jie Date: Mon, 9 Dec 2024 14:37:42 +0800 Subject: [PATCH 3/3] Update exercises/concept/name-badge/.docs/hints.md Co-authored-by: Angelika Cathor --- exercises/concept/name-badge/.docs/hints.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exercises/concept/name-badge/.docs/hints.md b/exercises/concept/name-badge/.docs/hints.md index a72b852aa4..f20a4b6722 100644 --- a/exercises/concept/name-badge/.docs/hints.md +++ b/exercises/concept/name-badge/.docs/hints.md @@ -22,4 +22,4 @@ [kernel-if]: https://hexdocs.pm/elixir/Kernel.html#if/2 [getting-started-basic-strings]: https://hexdocs.pm/elixir/basic-types.html#strings [getting-started-if]: https://hexdocs.pm/elixir/case-cond-and-if.html#if-unless -[elixirschool-if]: https://elixirschool.com/en/lessons/basics/control-structures/#if-and-unless +[elixirschool-if]: https://elixirschool.com/en/lessons/basics/control-structures/#if-and-unless-0