diff options
Diffstat (limited to 'calc')
| -rw-r--r-- | calc/calc.go | 2 | ||||
| -rw-r--r-- | calc/calc_test.go | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/calc/calc.go b/calc/calc.go index 574ea84..3c4ad4f 100644 --- a/calc/calc.go +++ b/calc/calc.go @@ -64,7 +64,7 @@ func init() { value = Any(number, groupExpr) } -func Calc(input string) (float64, error) { +func calc(input string) (float64, error) { result, err := Run(y, input) if err != nil { return 0, err diff --git a/calc/calc_test.go b/calc/calc_test.go index 13b2f5b..765e85a 100644 --- a/calc/calc_test.go +++ b/calc/calc_test.go @@ -7,48 +7,48 @@ import ( ) func TestNumbers(t *testing.T) { - result, err := Calc(`1`) + result, err := calc(`1`) require.NoError(t, err) require.EqualValues(t, 1, result) } func TestAddition(t *testing.T) { - result, err := Calc(`1+1`) + result, err := calc(`1+1`) require.NoError(t, err) require.EqualValues(t, 2, result) } func TestSubtraction(t *testing.T) { - result, err := Calc(`1-1`) + result, err := calc(`1-1`) require.NoError(t, err) require.EqualValues(t, 0, result) } func TestDivision(t *testing.T) { - result, err := Calc(`1/2`) + result, err := calc(`1/2`) require.NoError(t, err) require.EqualValues(t, .5, result) } func TestMultiplication(t *testing.T) { - result, err := Calc(`1*2`) + result, err := calc(`1*2`) require.NoError(t, err) require.EqualValues(t, 2, result) } func TestOrderOfOperations(t *testing.T) { - result, err := Calc(`1+10*2`) + result, err := calc(`1+10*2`) require.NoError(t, err) require.EqualValues(t, 21, result) } func TestParenthesis(t *testing.T) { - result, err := Calc(`(1+10)*2`) + result, err := calc(`(1+10)*2`) require.NoError(t, err) require.EqualValues(t, 22, result) } func TestRecursive(t *testing.T) { - result, err := Calc(`(1+(2*(3-(4/(5)))))`) + result, err := calc(`(1+(2*(3-(4/(5)))))`) require.NoError(t, err) require.EqualValues(t, 5.4, result) } |