diff options
| author | Adam Scarr <adam@vektah.net> | 2017-08-13 12:56:46 +1000 |
|---|---|---|
| committer | Adam Scarr <adam@vektah.net> | 2017-08-13 13:00:22 +1000 |
| commit | 77930f8f066b058c7e6cbae015523370ca3dab7e (patch) | |
| tree | fd0e4e3663f1183633fb16be297a20764a38d37c /calc/calc.go | |
| parent | f5b81e8e2eebd06e79159eaa3e721ac59ba3cc8c (diff) | |
Add map shorthand
Diffstat (limited to 'calc/calc.go')
| -rw-r--r-- | calc/calc.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/calc/calc.go b/calc/calc.go index 3c4ad4f..6dcd304 100644 --- a/calc/calc.go +++ b/calc/calc.go @@ -12,11 +12,11 @@ var ( sumOp = Chars("+-", 1, 1) prodOp = Chars("/*", 1, 1) - groupExpr = Map(Seq("(", sum, ")"), func(n Result) Result { + groupExpr = Seq("(", sum, ")").Map(func(n Result) Result { return Result{Result: n.Child[1].Result} }) - number = Map(NumberLit(), func(n Result) Result { + number = NumberLit().Map(func(n Result) Result { switch i := n.Result.(type) { case int64: return Result{Result: float64(i)} @@ -27,7 +27,7 @@ var ( } }) - sum = Map(Seq(prod, Some(Seq(sumOp, prod))), func(n Result) Result { + sum = Seq(prod, Some(Seq(sumOp, prod))).Map(func(n Result) Result { i := n.Child[0].Result.(float64) for _, op := range n.Child[1].Child { @@ -42,7 +42,7 @@ var ( return Result{Result: i} }) - prod = Map(Seq(&value, Some(Seq(prodOp, &value))), func(n Result) Result { + prod = Seq(&value, Some(Seq(prodOp, &value))).Map(func(n Result) Result { i := n.Child[0].Result.(float64) for _, op := range n.Child[1].Child { |