Removed use of postfix expressions.

Author: Dean Wampler

src/main/scala/progscala3/dsls/payroll/internal/DSL.scala

@@ -1,39 +1,38 @@
 // src/main/scala/progscala3/dsls/payroll/internal/DSL.scala
 package progscala3.dsls.payroll.internal
-import scala.language.postfixOps                                     // <1>
 import progscala3.dsls.payroll.*
 import progscala3.contexts.accounting.*
 
 @main def TryPayroll =
-  import dsl.*                                                       // <2>
-  val biweeklyDeductions = biweekly { deduct =>                      // <3>
-    deduct federal_tax        (25.0  percent)
-    deduct state_tax          (5.0   percent)
-    deduct insurance_premiums (500.0 dollars)
-    deduct retirement_savings (10.0  percent)
+  import dsl.*                                                       // <1>
+  val biweeklyDeductions = biweekly { deduct =>                      // <2>
+    deduct federal_tax        25.0.percent
+    deduct state_tax          5.0.percent
+    deduct insurance_premiums 500.0.dollars
+    deduct retirement_savings 10.0.percent
   }
 
-  println(biweeklyDeductions)                                        // <4>
+  println(biweeklyDeductions)                                        // <3>
   val annualGross = Dollars(100000.0)
   val gross = biweeklyDeductions.gross(annualGross)
   val net   = biweeklyDeductions.net(annualGross)
   print(f"Biweekly pay (annual: $annualGross): ")
   println(f"Gross: $gross, Net: $net")
 
 object dsl:
-  def biweekly(                                                      // <5>
+  def biweekly(                                                      // <4>
       db: DeductionsBuilder => DeductionsBuilder): Deductions =
     db(DeductionsBuilder("Biweekly", 26)).deductions
 
-  case class DeductionsBuilder(                                      // <6>
+  case class DeductionsBuilder(                                      // <5>
     name: String,
     annualPayPeriods: Int):
 
     private var all: Vector[Deduction] = Vector.empty
 
     def deductions: Deductions = Deductions(name, annualPayPeriods, all)
 
-    infix def federal_tax(amount: Percentage): DeductionsBuilder =   // <7>
+    infix def federal_tax(amount: Percentage): DeductionsBuilder =   // <6>
       all = all :+ PercentageDeduction("federal taxes", amount)
       this
 

src/test/scala/progscala3/dsls/payroll/PayrollSuite.scala

@@ -5,7 +5,6 @@ import progscala3.dsls.payroll.dsc
 import progscala3.contexts.accounting.*
 import munit.FunSuite
 import org.scalacheck.*
-import scala.language.postfixOps
 
 /**
  * ScalaCheck example driven by MUnit
@@ -17,7 +16,6 @@ class PayrollSuite extends FunSuite:
 
   test("Percentage can be constructed with a floating point literal") {
     assert(0.25.percent == Percentage(0.25))
-    assert((0.25 percent) == Percentage(0.25))
     assert(1.123456e3.percent == Percentage(1.123456e3))
   }
 
@@ -47,7 +45,6 @@ class PayrollSuite extends FunSuite:
 
   test("Dollars can be constructed with a floating point literal") {
     assert(0.25.dollars == Dollars(0.25))
-    assert((0.25 dollars) == Dollars(0.25))
     assert(1.123456e3.dollars == Dollars(1.123456e3))
   }
 

src/test/scala/progscala3/dsls/payroll/internal/DSLPropertiesSuite.scala

@@ -5,7 +5,6 @@ import munit.ScalaCheckSuite
 import org.scalacheck.*
 import progscala3.dsls.payroll.*
 import progscala3.contexts.accounting.*
-import scala.language.postfixOps
 
 /**
  * ScalaCheck example driven by MUnit
@@ -16,10 +15,10 @@ class DSLPropertiesSuite extends ScalaCheckSuite:
   import Prop.forAll
 
   val biweeklyDeductions = biweekly { deduct =>
-    deduct.federal_tax       (25.0  percent)
-    deduct.state_tax         (5.0   percent)
-    deduct.insurance_premiums(500.0 dollars)
-    deduct.retirement_savings(10.0  percent)
+    deduct.federal_tax       (25.0.percent)
+    deduct.state_tax         (5.0.percent)
+    deduct.insurance_premiums(500.0.dollars)
+    deduct.retirement_savings(10.0.percent)
   }
 
   def within(d1: Dollars, d2: Dollars): Boolean =