summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--scala.html.markdown11
1 files changed, 11 insertions, 0 deletions
diff --git a/scala.html.markdown b/scala.html.markdown
index 783c7ae6..173d271d 100644
--- a/scala.html.markdown
+++ b/scala.html.markdown
@@ -1,3 +1,9 @@
+---
+language: scala
+author: George Petrov
+author_url: http://www.georgepetrov.com
+---
+
/*
Set yourself up:
@@ -106,6 +112,11 @@ val x = 10
if (x == 1) println("yeah")
if (x == 10) println("yeah")
if (x == 11) println("yeah")
+if (x == 11) println ("yeah") else println("nope")
+
+println(if (x == 10) "yeah" else "nope")
+val text = if (x == 10) "yeah" else "nope"
+
// Object oriented features