Merge branch 'deanwampler:master' into fix/fix-locale-build-issue

Author: krzesii

build.sbt

@@ -1,4 +1,4 @@
-val scala3 = "3.0.1"
+val scala3 = "3.0.2"
 lazy val root = project
   .in(file("."))
   .settings(

src/script/scala/progscala3/IndentationSyntax.scala

@@ -85,10 +85,10 @@ def multiline(s: String): String =
 end multiline  // for constructors, use their name: this
 
 // Multiline value definition
-val foo =
+val hi =
   println("Hi World!")
   42
-end foo  // val doesn't work in this case, but...
+end hi  // val doesn't work in this case, but...
 
 val (foo, bar) =
   "foo" -> "bar"

src/script/scala/progscala3/typesystem/abstracttypes/AbstractTypesEx.scala

@@ -30,14 +30,12 @@ object Example extends ExampleTrait:
   val v1 = new T1 { val name1 = "T1" }
   val v2 = new T2 { val name1 = "T1"; val name2 = "T2" }
   val v3 = C("1", "2")
-  val v4 = Vector(C("3", "4"))
+  val v4 = Vector(v1)
 
   override def toString(): String =
     val v1str = s"v1: name1 = ${v1.name1}"
     val v2str = s"v2: name1 = ${v2.name1}, name2 = ${v2.name2}"
     s"Example: v1 = $v1str, v2 = $v2str, v3 = $v3, v4 = $v4"
 
-assert(Example.toString ==
-  "Example: v1 = v1: name1 = T1, v2 = v2: name1 = T1, " +
-  "name2 = T2, v3 = C(1,2), v4 = Vector(C(3,4))")
+println(Example.toString)
 // end::Example[]

src/script/scala/progscala3/typesystem/bounds/ViewToContextBounds.scala

@@ -22,4 +22,4 @@ assert(RemoteConnection.write(100)      == "-- 100 --")
 assert(RemoteConnection.write(3.14f)    == "-- 3.14 --")
 assert(RemoteConnection.write("hello!") == "-- hello! --")
 // The following fails: "no implicit view from (Int, Int) => ...
-RemoteConnection.write((1, 2))
+RemoteConnection.write((1, 2))  // Error!

src/script/scala/progscala3/typesystem/deptypes/DependentTypesBounds.scala

@@ -5,7 +5,6 @@
 // dependent types. This file focuses on recursive match types for integer
 // ranges.
 
-import scala.compiletime.S
 import scala.compiletime.ops.int.*
 
 // A type that allows values between MIN and MAX, inclusive.
@@ -21,11 +20,10 @@ val b7: Bounded[4,6] = 7      // ERROR
 
 // A type with allowed values between 0 and N-1, inclusive, the same numbers
 // for indexing into a sequence of size N!
-type IndexOf[N] = Bounded[0,N-1]
+type IndexOf[N <: Int] = Bounded[0,N-1]
 
 val im1: IndexOf[3] = -1      // ERROR
 val i0:  IndexOf[3]  = 0
 val i1:  IndexOf[3]  = 1
 val i2:  IndexOf[3]  = 2
 val i3:  IndexOf[3]  = 3       // ERROR
-

src/script/scala/progscala3/typesystem/deptypes/DependentTypesTuples.scala

@@ -6,7 +6,6 @@
 // can manipulate tuples like lists. Here, we'll experiment with dependent
 // types and the allowed arities (sizes) of the tuples.
 
-import scala.compiletime.S
 import scala.compiletime.ops.int.*
 
 // Only allow tuple values with exactly N elements.