From 4384083cc03113fae78c7f17cca7a5d16a9e4d14 Mon Sep 17 00:00:00 2001 From: sofiiako <19rubisco93@gmail.com> Date: Mon, 28 Jun 2021 19:19:30 +0300 Subject: [PATCH 1/9] Improved exercise section in Primitive Expressions --- Terms and Types/Primitive Expressions/task.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Terms and Types/Primitive Expressions/task.md b/Terms and Types/Primitive Expressions/task.md index 9b1bdba..868c9e2 100644 --- a/Terms and Types/Primitive Expressions/task.md +++ b/Terms and Types/Primitive Expressions/task.md @@ -70,4 +70,5 @@ ## Exercise - Complete the expression to return "Hello, Scala!" +Complete the expression in `sayHello()` to return "Hello, Scala!". +Complete the expression in `sumTheNumbers()` to return `4`. From ab8a2c8d5122ddb80fc53f71cc67591778b7f7cb Mon Sep 17 00:00:00 2001 From: sofiiako <19rubisco93@gmail.com> Date: Mon, 28 Jun 2021 19:23:08 +0300 Subject: [PATCH 2/9] Improved exercise section in Method Calls --- Terms and Types/Method Calls/task.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Terms and Types/Method Calls/task.md b/Terms and Types/Method Calls/task.md index f96d1e0..b0f9553 100644 --- a/Terms and Types/Method Calls/task.md +++ b/Terms and Types/Method Calls/task.md @@ -20,10 +20,13 @@ The object on which the method is applied is named the *target object*. Methods can have *parameters*. They are supplied between parentheses. -In the below examples, the `abs` method returns the absolute value of a +The `abs` method returns the absolute value of a number, and the `toUpperCase` method returns the target `String` in upper case. #### Exercise -Complete the methods invocations. \ No newline at end of file +Complete the methods invocations for the described methods. + +
The upperCaseMethod() should return "HELLO, SCALA!"
+
The absMethod() should return 42.
\ No newline at end of file From 2cc6795497e1625bbac9b90222cab5256c679e44 Mon Sep 17 00:00:00 2001 From: sofiiako <19rubisco93@gmail.com> Date: Mon, 28 Jun 2021 20:04:27 +0300 Subject: [PATCH 3/9] Updated exercise section in Operators --- Terms and Types/Operators/task.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Terms and Types/Operators/task.md b/Terms and Types/Operators/task.md index 067301e..5c7735a 100644 --- a/Terms and Types/Operators/task.md +++ b/Terms and Types/Operators/task.md @@ -29,7 +29,7 @@ The Scala compiler statically checks that you don’t combine incompatible expressions.

-Fill the following blank with values whose type is +Try filling the blank in the code editor with values whose type is different from `Int` and see the result. ## Exercise From 07e0dcf7a40f4cdf6c2750e9916cb249829d0bc5 Mon Sep 17 00:00:00 2001 From: sofiiako <19rubisco93@gmail.com> Date: Mon, 28 Jun 2021 20:36:13 +0300 Subject: [PATCH 4/9] Updated exercise section and added hints in Common Types --- Terms and Types/Common Types/task.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Terms and Types/Common Types/task.md b/Terms and Types/Common Types/task.md index 0abe37a..dcd4e1a 100644 --- a/Terms and Types/Common Types/task.md +++ b/Terms and Types/Common Types/task.md @@ -11,3 +11,10 @@ Note that type names always begin with an upper case letter. ## Exercise Here are some more methods of standard types. Can you guess what they do? +Complete their invocations. + +
The first one in an Int method toHexString, which returns +the Hexa decimal form of the specified integer value.
+
The contains() method is utilized to check whether a certain element is present in the range/list/set or not.
+
The drop(n) method returns all the elements of the collection except the first n ones.
+
The take() method is utilized to return a new collection consisting of the first n elements of the collection.
From 3d7b4c65946d208636738853ae4f8e270acc78f4 Mon Sep 17 00:00:00 2001 From: sofiiako <19rubisco93@gmail.com> Date: Mon, 28 Jun 2021 20:37:39 +0300 Subject: [PATCH 5/9] Minor edit in Method calls --- Terms and Types/Method Calls/task.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Terms and Types/Method Calls/task.md b/Terms and Types/Method Calls/task.md index b0f9553..a69652d 100644 --- a/Terms and Types/Method Calls/task.md +++ b/Terms and Types/Method Calls/task.md @@ -26,7 +26,7 @@ upper case. #### Exercise -Complete the methods invocations for the described methods. +Complete the invocations for the described methods.
The upperCaseMethod() should return "HELLO, SCALA!"
The absMethod() should return 42.
\ No newline at end of file From e50330814e248b994c18f4894ecde99d1f3a4845 Mon Sep 17 00:00:00 2001 From: sofiiako <19rubisco93@gmail.com> Date: Mon, 28 Jun 2021 20:39:13 +0300 Subject: [PATCH 6/9] Minor edit in Primitive Expressions --- Terms and Types/Primitive Expressions/task.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Terms and Types/Primitive Expressions/task.md b/Terms and Types/Primitive Expressions/task.md index 868c9e2..bca37fe 100644 --- a/Terms and Types/Primitive Expressions/task.md +++ b/Terms and Types/Primitive Expressions/task.md @@ -25,15 +25,15 @@ - The number “1”: - 1 + `1` - The boolean value "true": - true + `true` - The text "Hello, Scala!": - "Hello, Scala!" + `"Hello, Scala!"` (Note the usage of double quotes, `"`). @@ -44,11 +44,11 @@ - How many is one plus two? - 1 + 2 + `1 + 2` - What is the result of the concatenation of the texts “Hello, ” and “Scala!”? - "Hello, " ++ "Scala!" + `"Hello, " ++ "Scala!"` ## Evaluation From f39f084c275cedaeb07c07de5fd857da58885867 Mon Sep 17 00:00:00 2001 From: sofiiako <19rubisco93@gmail.com> Date: Tue, 29 Jun 2021 17:58:12 +0300 Subject: [PATCH 7/9] Fixed subheadings' text sizes --- Terms and Types/Common Types/task.md | 2 +- Terms and Types/Method Calls/task.md | 2 +- Terms and Types/Operators/task.md | 6 +++--- Terms and Types/Primitive Expressions/task.md | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Terms and Types/Common Types/task.md b/Terms and Types/Common Types/task.md index dcd4e1a..ca91480 100644 --- a/Terms and Types/Common Types/task.md +++ b/Terms and Types/Common Types/task.md @@ -8,7 +8,7 @@ Note that type names always begin with an upper case letter. -## Exercise +### Exercise Here are some more methods of standard types. Can you guess what they do? Complete their invocations. diff --git a/Terms and Types/Method Calls/task.md b/Terms and Types/Method Calls/task.md index a69652d..e5668ac 100644 --- a/Terms and Types/Method Calls/task.md +++ b/Terms and Types/Method Calls/task.md @@ -24,7 +24,7 @@ The `abs` method returns the absolute value of a number, and the `toUpperCase` method returns the target `String` in upper case. -#### Exercise +### Exercise Complete the invocations for the described methods. diff --git a/Terms and Types/Operators/task.md b/Terms and Types/Operators/task.md index 5c7735a..c8ea385 100644 --- a/Terms and Types/Operators/task.md +++ b/Terms and Types/Operators/task.md @@ -13,7 +13,7 @@ The infix syntax can also be used with regular methods: Any method with a parameter can be used like an infix operator. -## Values and Types +### Values and Types Expressions have a *value* and a *type*. The evaluation model defines how to get a value out of an expression. Types classify values. @@ -23,7 +23,7 @@ Both `0` and `1` are numbers, their type is `Int`.

`"foo"` and `"bar"` are text, their type is `String`. -## Static Typing +### Static Typing The Scala compiler statically checks that you don’t combine incompatible expressions. @@ -32,6 +32,6 @@ expressions. Try filling the blank in the code editor with values whose type is different from `Int` and see the result. -## Exercise +### Exercise Complete the range expression with an appropriate value. diff --git a/Terms and Types/Primitive Expressions/task.md b/Terms and Types/Primitive Expressions/task.md index bca37fe..d5aba5f 100644 --- a/Terms and Types/Primitive Expressions/task.md +++ b/Terms and Types/Primitive Expressions/task.md @@ -1,5 +1,5 @@ - ##Scala Tutorial + #Scala Tutorial The following set of sections provides a quick tutorial on the Scala language. @@ -9,7 +9,7 @@ The target audience is people who already have *some* experience of programming and who are familiar with the JVM. - ##Elements of Programming + ###Elements of Programming Programming languages give programmers ways to express computations. @@ -37,7 +37,7 @@ (Note the usage of double quotes, `"`). - ## Compound Expressions + ### Compound Expressions More complex expressions can be expressed by *combining* simpler expressions using *operators*. They can therefore express more complex computations: @@ -50,7 +50,7 @@ `"Hello, " ++ "Scala!"` - ## Evaluation + ### Evaluation A non-primitive expression is evaluated as follows. @@ -60,7 +60,7 @@ The evaluation process stops once it results in a value. - ### Example + #### Example Here is the evaluation of an arithmetic expression: @@ -68,7 +68,7 @@ 3 * 3 9 - ## Exercise + ### Exercise Complete the expression in `sayHello()` to return "Hello, Scala!". Complete the expression in `sumTheNumbers()` to return `4`. From d15ca2afd62c6f63d22ff7cf38236c2fee18db4c Mon Sep 17 00:00:00 2001 From: sofiiako <19rubisco93@gmail.com> Date: Thu, 1 Jul 2021 17:03:48 +0300 Subject: [PATCH 8/9] Revert "Fixed subheadings' text sizes" This reverts commit f39f084c --- Terms and Types/Common Types/task.md | 2 +- Terms and Types/Method Calls/task.md | 2 +- Terms and Types/Operators/task.md | 6 +++--- Terms and Types/Primitive Expressions/task.md | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Terms and Types/Common Types/task.md b/Terms and Types/Common Types/task.md index ca91480..dcd4e1a 100644 --- a/Terms and Types/Common Types/task.md +++ b/Terms and Types/Common Types/task.md @@ -8,7 +8,7 @@ Note that type names always begin with an upper case letter. -### Exercise +## Exercise Here are some more methods of standard types. Can you guess what they do? Complete their invocations. diff --git a/Terms and Types/Method Calls/task.md b/Terms and Types/Method Calls/task.md index e5668ac..a69652d 100644 --- a/Terms and Types/Method Calls/task.md +++ b/Terms and Types/Method Calls/task.md @@ -24,7 +24,7 @@ The `abs` method returns the absolute value of a number, and the `toUpperCase` method returns the target `String` in upper case. -### Exercise +#### Exercise Complete the invocations for the described methods. diff --git a/Terms and Types/Operators/task.md b/Terms and Types/Operators/task.md index c8ea385..5c7735a 100644 --- a/Terms and Types/Operators/task.md +++ b/Terms and Types/Operators/task.md @@ -13,7 +13,7 @@ The infix syntax can also be used with regular methods: Any method with a parameter can be used like an infix operator. -### Values and Types +## Values and Types Expressions have a *value* and a *type*. The evaluation model defines how to get a value out of an expression. Types classify values. @@ -23,7 +23,7 @@ Both `0` and `1` are numbers, their type is `Int`.

`"foo"` and `"bar"` are text, their type is `String`. -### Static Typing +## Static Typing The Scala compiler statically checks that you don’t combine incompatible expressions. @@ -32,6 +32,6 @@ expressions. Try filling the blank in the code editor with values whose type is different from `Int` and see the result. -### Exercise +## Exercise Complete the range expression with an appropriate value. diff --git a/Terms and Types/Primitive Expressions/task.md b/Terms and Types/Primitive Expressions/task.md index d5aba5f..bca37fe 100644 --- a/Terms and Types/Primitive Expressions/task.md +++ b/Terms and Types/Primitive Expressions/task.md @@ -1,5 +1,5 @@ - #Scala Tutorial + ##Scala Tutorial The following set of sections provides a quick tutorial on the Scala language. @@ -9,7 +9,7 @@ The target audience is people who already have *some* experience of programming and who are familiar with the JVM. - ###Elements of Programming + ##Elements of Programming Programming languages give programmers ways to express computations. @@ -37,7 +37,7 @@ (Note the usage of double quotes, `"`). - ### Compound Expressions + ## Compound Expressions More complex expressions can be expressed by *combining* simpler expressions using *operators*. They can therefore express more complex computations: @@ -50,7 +50,7 @@ `"Hello, " ++ "Scala!"` - ### Evaluation + ## Evaluation A non-primitive expression is evaluated as follows. @@ -60,7 +60,7 @@ The evaluation process stops once it results in a value. - #### Example + ### Example Here is the evaluation of an arithmetic expression: @@ -68,7 +68,7 @@ 3 * 3 9 - ### Exercise + ## Exercise Complete the expression in `sayHello()` to return "Hello, Scala!". Complete the expression in `sumTheNumbers()` to return `4`. From 71b7a8b2d224f217ff06bbf7ae815789588b901b Mon Sep 17 00:00:00 2001 From: sofiiako <19rubisco93@gmail.com> Date: Mon, 12 Jul 2021 14:12:56 +0300 Subject: [PATCH 9/9] Corrected spelling --- Terms and Types/Common Types/task.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Terms and Types/Common Types/task.md b/Terms and Types/Common Types/task.md index dcd4e1a..7b979f5 100644 --- a/Terms and Types/Common Types/task.md +++ b/Terms and Types/Common Types/task.md @@ -14,7 +14,7 @@ Here are some more methods of standard types. Can you guess what they do? Complete their invocations.
The first one in an Int method toHexString, which returns -the Hexa decimal form of the specified integer value.
+the hexadecimal form of the specified integer value.
The contains() method is utilized to check whether a certain element is present in the range/list/set or not.
The drop(n) method returns all the elements of the collection except the first n ones.
The take() method is utilized to return a new collection consisting of the first n elements of the collection.