Skip to content

Commit e535aeb

Browse files
eugene70eugene70
authored
Merge branch 'master' into master
2 parents 82c8d99 + fea90d0 commit e535aeb

File tree

594 files changed

+871
-2302
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

594 files changed

+871
-2302
lines changed

‎Gemfile.lock

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (5.2.0)
4+
activesupport (5.2.3)
55
concurrent-ruby (~> 1.0, >= 1.0.2)
66
i18n (>= 0.7, < 2)
77
minitest (~> 5.1)
88
tzinfo (~> 1.1)
99
addressable (2.6.0)
1010
public_suffix (>= 2.0.2, < 4.0)
1111
colorator (1.1.0)
12-
colorize (0.8.1)
1312
concurrent-ruby (1.1.5)
1413
em-websocket (0.5.1)
1514
eventmachine (>= 0.12.9)
1615
http_parser.rb (~> 0.6.0)
17-
ethon (0.11.0)
16+
ethon (0.12.0)
1817
ffi (>= 1.3.0)
1918
eventmachine (1.2.7)
2019
ffi (1.11.1)
2120
forwardable-extended (2.6.0)
22-
html-proofer (3.9.1)
21+
html-proofer (3.11.1)
2322
activesupport (>= 4.2, < 6.0)
2423
addressable (~> 2.3)
25-
colorize (~> 0.8)
2624
mercenary (~> 0.3.2)
27-
nokogiri (~> 1.8.1)
25+
nokogiri (~> 1.9)
2826
parallel (~> 1.3)
27+
rainbow (~> 3.0)
2928
typhoeus (~> 1.3)
3029
yell (~> 2.0)
3130
http_parser.rb (0.6.0)
@@ -59,14 +58,15 @@ GEM
5958
rb-inotify (~> 0.9, >= 0.9.7)
6059
ruby_dep (~> 1.2)
6160
mercenary (0.3.6)
62-
mini_portile2 (2.3.0)
61+
mini_portile2 (2.4.0)
6362
minitest (5.11.3)
64-
nokogiri (1.8.5)
65-
mini_portile2 (~> 2.3.0)
66-
parallel (1.12.1)
63+
nokogiri (1.10.4)
64+
mini_portile2 (~> 2.4.0)
65+
parallel (1.17.0)
6766
pathutil (0.16.2)
6867
forwardable-extended (~> 2.6)
69-
public_suffix (3.0.3)
68+
public_suffix (3.1.1)
69+
rainbow (3.0.0)
7070
rb-fsevent (0.10.3)
7171
rb-inotify (0.10.0)
7272
ffi (~> 1.0)
@@ -79,11 +79,11 @@ GEM
7979
rb-fsevent (~> 0.9, >= 0.9.4)
8080
rb-inotify (~> 0.9, >= 0.9.7)
8181
thread_safe (0.3.6)
82-
typhoeus (1.3.0)
82+
typhoeus (1.3.1)
8383
ethon (>= 0.9.0)
8484
tzinfo (1.2.5)
8585
thread_safe (~> 0.1)
86-
yell (2.0.7)
86+
yell (2.2.0)
8787

8888
PLATFORMS
8989
ruby

‎_ba/cheatsheets/index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ title: Scala Cheatsheet
55
partof: cheatsheet
66

77
by: Brendan O'Connor
8-
about: Zahvaljujući <a href="http://brenocon.com/">Brendan O'Connor</a>u ovaj cheatsheet teži da bude kratki pregled sintakse Scale. Licenca pripada Brendan O'Connor-u, pod CC-BY-SA 3.0 licencom.
8+
about: Zahvaljujući <a href="https://brenocon.com/">Brendan O'Connor</a>u ovaj cheatsheet teži da bude kratki pregled sintakse Scale. Licenca pripada Brendan O'Connor-u, pod CC-BY-SA 3.0 licencom.
99

1010
language: ba
1111
---
@@ -47,7 +47,7 @@ language: ba
4747
| `var (x,y,z) = (1,2,3)` | destrukturirajuće vezivanje: otpakivanje torke podudaranjem uzoraka (pattern matching). |
4848
| <span class="label important">Loše</span>`var x,y,z = (1,2,3)` | skrivena greška: svim varijablama dodijeljena cijela torka. |
4949
| `var xs = List(1,2,3)` | lista (nepromjenjiva). |
50-
| `xs(2)` | indeksiranje zagradama ([slajdovi](http://www.slideshare.net/Odersky/fosdem-2009-1013261/27)). |
50+
| `xs(2)` | indeksiranje zagradama ([slajdovi](https://www.slideshare.net/Odersky/fosdem-2009-1013261/27)). |
5151
| `1 :: List(2,3)` | cons. |
5252
| `1 to 5` _isto kao_ `1 until 6` <br> `1 to 10 by 2` | šećer za raspon (range). |
5353
| `()` _(prazne zagrade)_ | jedina instanca Unit tipa (slično kao u C/Java void). |
@@ -56,11 +56,11 @@ language: ba
5656
| `if (check) happy` _isto kao_ <br> `if (check) happy else ()` | sintaksni šećer za uslov. |
5757
| `while (x < 5) { println(x); x += 1}` | while petlja. |
5858
| `do { println(x); x += 1} while (x < 5)` | do while petlja. |
59-
| `import scala.util.control.Breaks._`<br>`breakable {`<br>` for (x <- xs) {`<br>` if (Math.random < 0.1) break`<br>` }`<br>`}`| break ([slajdovi](http://www.slideshare.net/Odersky/fosdem-2009-1013261/21)). |
59+
| `import scala.util.control.Breaks._`<br>`breakable {`<br>` for (x <- xs) {`<br>` if (Math.random < 0.1) break`<br>` }`<br>`}`| break ([slajdovi](https://www.slideshare.net/Odersky/fosdem-2009-1013261/21)). |
6060
| `for (x <- xs if x%2 == 0) yield x*10` _isto kao_ <br>`xs.filter(_%2 == 0).map(_*10)` | for komprehensija: filter/map. |
6161
| `for ((x,y) <- xs zip ys) yield x*y` _isto kao_ <br>`(xs zip ys) map { case (x,y) => x*y }` | for komprehensija: destrukturirajuće vezivanje. |
6262
| `for (x <- xs; y <- ys) yield x*y` _isto kao_ <br>`xs flatMap {x => ys map {y => x*y}}` | for komprehensija: međuproizvod (vektorski proizvod). |
63-
| `for (x <- xs; y <- ys) {`<br> `println("%d/%d = %.1f".format(x, y, x/y.toFloat))`<br>`}` | for komprehensija: imperativ-asto.<br>[sprintf-stil.](http://java.sun.com/javase/6/docs/api/java/util/Formatter.html#syntax) |
63+
| `for (x <- xs; y <- ys) {`<br> `println("%d/%d = %.1f".format(x, y, x/y.toFloat))`<br>`}` | for komprehensija: imperativ-asto.<br>[sprintf-stil.](https://java.sun.com/javase/6/docs/api/java/util/Formatter.html#syntax) |
6464
| `for (i <- 1 to 5) {`<br> `println(i)`<br>`}` | for komprehensija: iteracija uključujući gornju granicu. |
6565
| `for (i <- 1 until 5) {`<br> `println(i)`<br>`}` | for komprehensija: iteracija ne uključujući gornju granicu. |
6666
| <span id="pattern_matching" class="h2">podudaranje uzoraka (pattern matching)</span> | |

‎_ba/tour/abstract-type-members.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: tour
33
title: Apstraktni tipovi
44
language: ba
5-
6-
discourse: true
7-
85
partof: scala-tour
96

107
num: 23

‎_ba/tour/annotations.md

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: tour
33
title: Anotacije
44
language: ba
5-
6-
discourse: true
7-
85
partof: scala-tour
96

107
num: 32
@@ -82,15 +79,15 @@ Java ima korisnički definisane metapodatke u formi [anotacija](https://docs.ora
8279
I upotrijebiti je ovako:
8380

8481
```
85-
@Source(URL = "http://coders.com/",
82+
@Source(URL = "https://coders.com/",
8683
mail = "[email protected]")
8784
public class MyClass extends HisClass ...
8885
```
8986

9087
Primjena anotacije u Scali izgleda kao poziv konstruktora, dok se za instanciranje Javinih anotacija moraju koristiti imenovani argumenti:
9188

9289
```
93-
@Source(URL = "http://coders.com/",
90+
@Source(URL = "https://coders.com/",
9491
mail = "[email protected]")
9592
class MyScalaClass ...
9693
```
@@ -108,30 +105,30 @@ ako se koristi naziv `value` onda se u Javi može koristiti i konstruktor-sintak
108105
I upotrijebiti je kao:
109106

110107
```
111-
@SourceURL("http://coders.com/")
108+
@SourceURL("https://coders.com/")
112109
public class MyClass extends HisClass ...
113110
```
114111

115112
U ovom slučaju, Scala omogućuje istu sintaksu:
116113

117114
```
118-
@SourceURL("http://coders.com/")
115+
@SourceURL("https://coders.com/")
119116
class MyScalaClass ...
120117
```
121118

122119
Element `mail` je specificiran s podrazumijevanom vrijednošću tako da ne moramo eksplicitno navoditi vrijednost za njega.
123120
Međutim, ako trebamo, ne možemo miješati dva Javina stila:
124121

125122
```
126-
@SourceURL(value = "http://coders.com/",
123+
@SourceURL(value = "https://coders.com/",
127124
mail = "[email protected]")
128125
public class MyClass extends HisClass ...
129126
```
130127

131128
Scala omogućuje veću fleksibilnost u ovom pogledu:
132129

133130
```
134-
@SourceURL("http://coders.com/",
131+
@SourceURL("https://coders.com/",
135132
mail = "[email protected]")
136133
class MyScalaClass ...
137134
```

‎_ba/tour/automatic-closures.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
---
22
layout: tour
33
title: Automatic Type-Dependent Closure Construction
4-
5-
discourse: false
6-
74
partof: scala-tour
85

96
language: ba

‎_ba/tour/basics.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: tour
33
title: Osnove
44
language: ba
5-
6-
discourse: true
7-
85
partof: scala-tour
96

107
num: 2

‎_ba/tour/by-name-parameters.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: tour
33
title: By-name parametri
44
language: ba
5-
6-
discourse: true
7-
85
partof: scala-tour
96

107
num: 31

‎_ba/tour/case-classes.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: tour
33
title: Case klase
44
language: ba
5-
6-
discourse: true
7-
85
partof: scala-tour
96

107
num: 11

‎_ba/tour/classes.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: tour
33
title: Klase
44
language: ba
5-
6-
discourse: true
7-
85
partof: scala-tour
96

107
num: 4

‎_ba/tour/compound-types.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: tour
33
title: Složeni tipovi
44
language: ba
5-
6-
discourse: true
7-
85
partof: scala-tour
96

107
num: 24

‎_ba/tour/default-parameter-values.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: tour
33
title: Podrazumijevane vrijednosti parametara
44
language: ba
5-
6-
discourse: true
7-
85
partof: scala-tour
96

107
num: 33

‎_ba/tour/extractor-objects.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: tour
33
title: Ekstraktor objekti
44
language: ba
5-
6-
discourse: true
7-
85
partof: scala-tour
96

107
num: 16

‎_ba/tour/generic-classes.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: tour
33
title: Generičke klase
44
language: ba
5-
6-
discourse: true
7-
85
partof: scala-tour
96

107
num: 18

‎_ba/tour/higher-order-functions.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: tour
33
title: Funkcije višeg reda
44
language: ba
5-
6-
discourse: true
7-
85
partof: scala-tour
96

107
num: 8

‎_ba/tour/implicit-conversions.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: tour
33
title: Implicitne konverzije
44
language: ba
5-
6-
discourse: true
7-
85
partof: scala-tour
96

107
num: 27

‎_ba/tour/implicit-parameters.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: tour
33
title: Implicitni parametri
44
language: ba
5-
6-
discourse: true
7-
85
partof: scala-tour
96

107
num: 26

‎_ba/tour/inner-classes.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: tour
33
title: Unutarnje klase
44
language: ba
5-
6-
discourse: true
7-
85
partof: scala-tour
96

107
num: 22

‎_ba/tour/lower-type-bounds.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: tour
33
title: Donja granica tipa
44
language: ba
5-
6-
discourse: true
7-
85
partof: scala-tour
96

107
num: 21

‎_ba/tour/mixin-class-composition.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: tour
33
title: Kompozicija mixin klasa
44
language: ba
5-
6-
discourse: true
7-
85
partof: scala-tour
96

107
num: 6

‎_ba/tour/multiple-parameter-lists.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: tour
33
title: Curry-jevanje
44
language: ba
5-
6-
discourse: true
7-
85
partof: scala-tour
96

107
num: 10

‎_ba/tour/named-arguments.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: tour
33
title: Imenovani parametri
44
language: ba
5-
6-
discourse: true
7-
85
partof: scala-tour
96

107
num: 34

‎_ba/tour/nested-functions.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: tour
33
title: Ugniježdene metode
44
language: ba
5-
6-
discourse: true
7-
85
partof: scala-tour
96

107
num: 9

‎_ba/tour/operators.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: tour
33
title: Operatori
44
language: ba
5-
6-
discourse: true
7-
85
partof: scala-tour
96

107
num: 30

‎_ba/tour/package-objects.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: tour
33
title: Package Objects
44
language: ba
5-
6-
discourse: true
7-
85
partof: scala-tour
96

107
num: 36

‎_ba/tour/packages-and-imports.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: tour
33
title: Packages and Imports
44
language: ba
5-
6-
discourse: true
7-
85
partof: scala-tour
96

107
num: 35

‎_ba/tour/pattern-matching.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: tour
33
title: Podudaranje uzoraka (pattern matching)
44
language: ba
5-
6-
discourse: true
7-
85
partof: scala-tour
96

107
num: 12

0 commit comments

Comments
 (0)