Mercurial Mercurial > hg > pep-material / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
progs/lecture1.scala
changeset 143 11396c17cd8b
parent 140 ecec79b9ab25
child 147 72f7dd1a3754 
--- a/progs/lecture1.scala	Fri Nov 10 09:00:46 2017 +0000
+++ b/progs/lecture1.scala	Fri Nov 10 09:23:23 2017 +0000
@@ -123,16 +123,16 @@
 println("""">\n<"""")
 
 /* in Java
-val lyrics = "Sun dips down, the day has gone \n" +
-             "Witches, wolves and giants yawn \n" +
-             "Queen and dragon, troll and gnome \n" +
-             "Baddy buddies head for home"
+val lyrics = "Sun dips down, the day has gone. \n" +
+             "Witches, wolves and giants yawn. \n" +
+             "Queen and dragon, troll and gnome: \n" +
+             "tired buddies head for home"
 */ 
 
-val lyrics = """Sun dips down, the day has gone
-                |Witches, wolves and giants yawn
-                |Queen and dragon, troll and gnome
-                |Baddy buddies head for home""".stripMargin
+val lyrics = """Sun dips down, the day has gone.
+                |Witches, wolves and giants yawn.
+                |Queen and dragon, troll and gnome:
+                |tired buddies head for home""".stripMargin
 
 println(lyrics)
 
@@ -171,7 +171,7 @@
 // If-Conditionals
 //=================
 
-def fact(n: Int): Int = 
+def fact(n: Int) : Int = 
   if (n == 0) 1 else n * fact(n - 1)
pep-material