From 27689aad9f3cefc0eace6ec835949b024731f382 Mon Sep 17 00:00:00 2001 From: Inanc Gumus Date: Mon, 22 Oct 2018 22:20:09 +0300 Subject: [PATCH] refactor: variables/short declaration exercises and questions --- .../exercises/{01 => 01-short-declare}/main.go | 7 ++++--- .../{01 => 01-short-declare}/solution/main.go | 0 .../{02 => 02-multiple-short-declare}/main.go | 3 ++- .../solution/main.go | 0 .../{03 => 03-multiple-short-declare-2}/main.go | 9 +++++---- .../solution/main.go | 0 .../{04 => 04-short-with-expression}/main.go | 8 +++++--- .../solution/main.go | 0 .../exercises/{05 => 05-short-discard}/main.go | 11 ++++++----- .../{05 => 05-short-discard}/solution/main.go | 0 .../exercises/{06 => 06-redeclare}/main.go | 9 +++++---- .../{06 => 06-redeclare}/solution/main.go | 0 .../03-short-declaration/exercises/README.md | 15 +++++++++++++++ .../questions/{questions.md => README.md} | 0 14 files changed, 42 insertions(+), 20 deletions(-) rename 06-variables/03-short-declaration/exercises/{01 => 01-short-declare}/main.go (82%) rename 06-variables/03-short-declaration/exercises/{01 => 01-short-declare}/solution/main.go (100%) rename 06-variables/03-short-declaration/exercises/{02 => 02-multiple-short-declare}/main.go (93%) rename 06-variables/03-short-declaration/exercises/{02 => 02-multiple-short-declare}/solution/main.go (100%) rename 06-variables/03-short-declaration/exercises/{03 => 03-multiple-short-declare-2}/main.go (72%) rename 06-variables/03-short-declaration/exercises/{03 => 03-multiple-short-declare-2}/solution/main.go (100%) rename 06-variables/03-short-declaration/exercises/{04 => 04-short-with-expression}/main.go (76%) rename 06-variables/03-short-declaration/exercises/{04 => 04-short-with-expression}/solution/main.go (100%) rename 06-variables/03-short-declaration/exercises/{05 => 05-short-discard}/main.go (76%) rename 06-variables/03-short-declaration/exercises/{05 => 05-short-discard}/solution/main.go (100%) rename 06-variables/03-short-declaration/exercises/{06 => 06-redeclare}/main.go (79%) rename 06-variables/03-short-declaration/exercises/{06 => 06-redeclare}/solution/main.go (100%) create mode 100644 06-variables/03-short-declaration/exercises/README.md rename 06-variables/03-short-declaration/questions/{questions.md => README.md} (100%) diff --git a/06-variables/03-short-declaration/exercises/01/main.go b/06-variables/03-short-declaration/exercises/01-short-declare/main.go similarity index 82% rename from 06-variables/03-short-declaration/exercises/01/main.go rename to 06-variables/03-short-declaration/exercises/01-short-declare/main.go index 22c1cb8..e94f36b 100644 --- a/06-variables/03-short-declaration/exercises/01/main.go +++ b/06-variables/03-short-declaration/exercises/01-short-declare/main.go @@ -8,9 +8,10 @@ package main // --------------------------------------------------------- -// EXERCISE -// Declare and then print four variables -// using the short declaration statement +// EXERCISE: Short Declare +// +// Declare and then print four variables using +// the short declaration statement. // // EXPECTED OUTPUT // i: 314 f: 3.14 s: Hello b: true diff --git a/06-variables/03-short-declaration/exercises/01/solution/main.go b/06-variables/03-short-declaration/exercises/01-short-declare/solution/main.go similarity index 100% rename from 06-variables/03-short-declaration/exercises/01/solution/main.go rename to 06-variables/03-short-declaration/exercises/01-short-declare/solution/main.go diff --git a/06-variables/03-short-declaration/exercises/02/main.go b/06-variables/03-short-declaration/exercises/02-multiple-short-declare/main.go similarity index 93% rename from 06-variables/03-short-declaration/exercises/02/main.go rename to 06-variables/03-short-declaration/exercises/02-multiple-short-declare/main.go index 7921ce6..a155657 100644 --- a/06-variables/03-short-declaration/exercises/02/main.go +++ b/06-variables/03-short-declaration/exercises/02-multiple-short-declare/main.go @@ -8,7 +8,8 @@ package main // --------------------------------------------------------- -// EXERCISE +// EXERCISE: Multiple Short Declare +// // Declare two variables using multiple short declaration // // EXPECTED OUTPUT diff --git a/06-variables/03-short-declaration/exercises/02/solution/main.go b/06-variables/03-short-declaration/exercises/02-multiple-short-declare/solution/main.go similarity index 100% rename from 06-variables/03-short-declaration/exercises/02/solution/main.go rename to 06-variables/03-short-declaration/exercises/02-multiple-short-declare/solution/main.go diff --git a/06-variables/03-short-declaration/exercises/03/main.go b/06-variables/03-short-declaration/exercises/03-multiple-short-declare-2/main.go similarity index 72% rename from 06-variables/03-short-declaration/exercises/03/main.go rename to 06-variables/03-short-declaration/exercises/03-multiple-short-declare-2/main.go index 3ffb976..f24a68d 100644 --- a/06-variables/03-short-declaration/exercises/03/main.go +++ b/06-variables/03-short-declaration/exercises/03-multiple-short-declare-2/main.go @@ -8,11 +8,12 @@ package main // --------------------------------------------------------- -// EXERCISE -// 1- Declare two variables using short declaration +// EXERCISE: Multiple Short Declare #2 // -// 2- `a` variable's value should be 42 -// 3- `c` variable's value should be "good" +// 1. Declare two variables using short declaration +// +// 2. `a` variable's value should be 42 +// 3. `c` variable's value should be "good" // // EXPECTED OUTPUT // 42 good diff --git a/06-variables/03-short-declaration/exercises/03/solution/main.go b/06-variables/03-short-declaration/exercises/03-multiple-short-declare-2/solution/main.go similarity index 100% rename from 06-variables/03-short-declaration/exercises/03/solution/main.go rename to 06-variables/03-short-declaration/exercises/03-multiple-short-declare-2/solution/main.go diff --git a/06-variables/03-short-declaration/exercises/04/main.go b/06-variables/03-short-declaration/exercises/04-short-with-expression/main.go similarity index 76% rename from 06-variables/03-short-declaration/exercises/04/main.go rename to 06-variables/03-short-declaration/exercises/04-short-with-expression/main.go index 348522e..77b919d 100644 --- a/06-variables/03-short-declaration/exercises/04/main.go +++ b/06-variables/03-short-declaration/exercises/04-short-with-expression/main.go @@ -8,9 +8,11 @@ package main // --------------------------------------------------------- -// EXERCISE -// 1- Short declare a variable named `sum` -// 2- Initialize it with an expression by adding 27 and 3.5 +// EXERCISE: Short With Expression +// +// 1. Short declare a variable named `sum` +// +// 2. Initialize it with an expression by adding 27 and 3.5 // // EXPECTED OUTPUT // 30.5 diff --git a/06-variables/03-short-declaration/exercises/04/solution/main.go b/06-variables/03-short-declaration/exercises/04-short-with-expression/solution/main.go similarity index 100% rename from 06-variables/03-short-declaration/exercises/04/solution/main.go rename to 06-variables/03-short-declaration/exercises/04-short-with-expression/solution/main.go diff --git a/06-variables/03-short-declaration/exercises/05/main.go b/06-variables/03-short-declaration/exercises/05-short-discard/main.go similarity index 76% rename from 06-variables/03-short-declaration/exercises/05/main.go rename to 06-variables/03-short-declaration/exercises/05-short-discard/main.go index 5d616c1..763a041 100644 --- a/06-variables/03-short-declaration/exercises/05/main.go +++ b/06-variables/03-short-declaration/exercises/05-short-discard/main.go @@ -8,17 +8,18 @@ package main // --------------------------------------------------------- -// EXERCISE -// 1- Short declare two bool variables +// EXERCISE: Short Discard +// +// 1. Short declare two bool variables // (use multiple short declaration syntax) // -// 2- Initialize both variables to true +// 2. Initialize both variables to true // -// 3- Change your declaration and +// 3. Change your declaration and // discard the 2nd variable's value // using the blank-identifier // -// 4- Print only the 1st variable +// 4. Print only the 1st variable // // EXPECTED OUTPUT // true diff --git a/06-variables/03-short-declaration/exercises/05/solution/main.go b/06-variables/03-short-declaration/exercises/05-short-discard/solution/main.go similarity index 100% rename from 06-variables/03-short-declaration/exercises/05/solution/main.go rename to 06-variables/03-short-declaration/exercises/05-short-discard/solution/main.go diff --git a/06-variables/03-short-declaration/exercises/06/main.go b/06-variables/03-short-declaration/exercises/06-redeclare/main.go similarity index 79% rename from 06-variables/03-short-declaration/exercises/06/main.go rename to 06-variables/03-short-declaration/exercises/06-redeclare/main.go index efba8b9..56f7d23 100644 --- a/06-variables/03-short-declaration/exercises/06/main.go +++ b/06-variables/03-short-declaration/exercises/06-redeclare/main.go @@ -8,16 +8,17 @@ package main // --------------------------------------------------------- -// EXERCISE -// 1- Short declare two int variables: age and yourAge +// EXERCISE: Redeclare +// +// 1. Short declare two int variables: age and yourAge // (use multiple short declaration syntax) // -// 2- Short declare a new float variable: ratio +// 2. Short declare a new float variable: ratio // And, change the 'age' variable to 42 // // (! You should use redeclaration) // -// 4- Print all the variables +// 4. Print all the variables // // EXPECTED OUTPUT // 42, 20, 3.14 diff --git a/06-variables/03-short-declaration/exercises/06/solution/main.go b/06-variables/03-short-declaration/exercises/06-redeclare/solution/main.go similarity index 100% rename from 06-variables/03-short-declaration/exercises/06/solution/main.go rename to 06-variables/03-short-declaration/exercises/06-redeclare/solution/main.go diff --git a/06-variables/03-short-declaration/exercises/README.md b/06-variables/03-short-declaration/exercises/README.md new file mode 100644 index 0000000..b5fe5b7 --- /dev/null +++ b/06-variables/03-short-declaration/exercises/README.md @@ -0,0 +1,15 @@ +# Short Declare + +Time to declare a few variables using the short declaration syntax. You'll also use the redeclaration and discarding. + +1. **[Short Declare](https://github.com/inancgumus/learngo/tree/master/06-variables/03-short-declaration/exercises/01-short-declare)** + +2. **[Multiple Short Declare](https://github.com/inancgumus/learngo/tree/master/06-variables/03-short-declaration/exercises/02-multiple-short-declare)** + +3. **[Multiple Short Declare #2](https://github.com/inancgumus/learngo/tree/master/06-variables/03-short-declaration/exercises/03-multiple-short-declare-2)** + +4. **[Short With Expression](https://github.com/inancgumus/learngo/tree/master/06-variables/03-short-declaration/exercises/04-short-with-expression)** + +5. **[Short Discard](https://github.com/inancgumus/learngo/tree/master/06-variables/03-short-declaration/exercises/05-short-discard)** + +6. **[Redeclare](https://github.com/inancgumus/learngo/tree/master/06-variables/03-short-declaration/exercises/06-redeclare)** \ No newline at end of file diff --git a/06-variables/03-short-declaration/questions/questions.md b/06-variables/03-short-declaration/questions/README.md similarity index 100% rename from 06-variables/03-short-declaration/questions/questions.md rename to 06-variables/03-short-declaration/questions/README.md