diff --git a/src/main/scala/demo1/DemoVar.scala b/src/main/scala/chapter1/demo1/DemoVar.scala similarity index 96% rename from src/main/scala/demo1/DemoVar.scala rename to src/main/scala/chapter1/demo1/DemoVar.scala index 816429e..6c5dc3e 100644 --- a/src/main/scala/demo1/DemoVar.scala +++ b/src/main/scala/chapter1/demo1/DemoVar.scala @@ -1,4 +1,4 @@ -package demo1 +package chapter1.demo1 object DemoVar { def main(args: Array[String]): Unit = { diff --git a/src/main/scala/demo2/DemoStr.scala b/src/main/scala/chapter1/demo2/DemoStr.scala similarity index 96% rename from src/main/scala/demo2/DemoStr.scala rename to src/main/scala/chapter1/demo2/DemoStr.scala index 32a20dd..dbae2c7 100644 --- a/src/main/scala/demo2/DemoStr.scala +++ b/src/main/scala/chapter1/demo2/DemoStr.scala @@ -1,4 +1,4 @@ -package demo2 +package chapter1.demo2 object DemoStr { def main(args: Array[String]): Unit = { diff --git a/src/main/scala/demo2/DemoVar2.scala b/src/main/scala/chapter1/demo2/DemoVar2.scala similarity index 97% rename from src/main/scala/demo2/DemoVar2.scala rename to src/main/scala/chapter1/demo2/DemoVar2.scala index 10a40fd..7e82fc7 100644 --- a/src/main/scala/demo2/DemoVar2.scala +++ b/src/main/scala/chapter1/demo2/DemoVar2.scala @@ -1,4 +1,4 @@ -package demo2 +package chapter1.demo2 object DemoVar2 { def main(args: Array[String]): Unit = { diff --git a/src/main/scala/chapter1/demo3/DemoOps.scala b/src/main/scala/chapter1/demo3/DemoOps.scala new file mode 100644 index 0000000..0d54cf0 --- /dev/null +++ b/src/main/scala/chapter1/demo3/DemoOps.scala @@ -0,0 +1,60 @@ +package chapter1.demo3 + +object DemoOps { + def main(args: Array[String]): Unit = { + // 1. 算术运算符 + val result1: Int = 10 / 3 // 3 + println(s"result1 = ${result1}") //不能整除,取整数部分 + + val result2: Double = 10 / 3 + println(s"result2 = ${result2}") // 两个整数做除法,结果也是整数,赋值给result2时,转成double 10/3 = 3 ==> 3.0 + + val result3: Double = 10.0 / 3 + println(s"result3 = ${result3}") // double除以整型 10.0 / 3 ==> 10.0/3.0 ==> 3.33333 + + val result4: Int = (+10) + (-3) + println(s"result4 = ${result4}") + + // 2. 比较运算符 + val a1: Int = 10 + val b1: Int = 10 + println(s"a1==b1 = ${a1 == b1}") + println(s"a1.equals(b1) = ${a1.equals(b1)}") + println(s"a1!=b1 = ${a1 != b1}") + println(s"a1>b1 = ${a1 > b1}") + println(s"a1>=b1 = ${a1 >= b1}") + + + // 3. 逻辑运算符 + val n = 1 + println((6 > 5) && (n > 0)) // true + println((6 > 5) && (n < 0)) // false + println((6 > 5) || (n > 0)) + println((6 > 5) || (n < 0)) + println(!((6 > 5) && (n > 0))) + + + // 4. 赋值运算符 + var a = 10 + a += 1 // a = a + 1 + println(a) + a -= 1 + a /= 1 + a %= 1 + + a <<= 1 // a = a << 1 + + a &= 1 // a = a & 1 // 按位与 运算 + a |= 1 // a = a | 1 // 按位或 运算 + a ^= 1 // a = a ^ 1 // 异或 运算 + + + val b = 10 + val c = b + a + + val d = b.+(a) + // b.add(a) + val e = b +(a) + val f = b +a + } +} diff --git a/src/main/scala/demo3/DemoOps.scala b/src/main/scala/demo3/DemoOps.scala deleted file mode 100644 index 6b1c878..0000000 --- a/src/main/scala/demo3/DemoOps.scala +++ /dev/null @@ -1,48 +0,0 @@ -package demo3 - -object DemoOps { - def main(args: Array[String]): Unit = { - - // 1.算术运算符 - val result1: Int = 10 / 3 //3 - println(s"result1 = ${result1}") //不能整除,取整数部分 - - val result2: Double = 10 / 3 - println(s"result2 = ${result2}") // 两个整数做除法,结果也是证书,赋值给result2时,转成double 10/3 = 3 == 3。0 - - val result3: Double = 10.0 / 3 - println(s"result3 = ${result3}") // double除以整形 10.3 / 3 ==> 10.0/3.0 ==> 3.33333 - - val result4: Int = (+10) + (-3) - println(s"result4 = ${result4}") - - // 2.比较运算符 - val a1: Int = 10 - val b1: Int = 10 - println(s"a1==b1 = ${a1 == b1}") - println(s"a1.equals(b1) = ${a1.equals(b1)}") - println(s"a1 != b1 = ${a1 != b1}") - println(s"a1>b1 = ${a1 > b1}") - println(s"a1 >= b1 = ${a1 >= b1}") - - // 3.逻辑运算符 - val n = 1 - println((6 > 5) && (n > 0)) - println((6 > 5) && (n < 0)) - println((6 > 5) || (n > 0)) - println((6 > 5) || (n < 0)) - println(!((6 > 5) && (n > 0))) - - // 4.赋值运算符 - var a = 10 - a += 1 // a = a + 1 - println(a) - a -= 1 - a /= 1 - a %= 1 - - - - } - -}