Skip to content

Add mod, max, and min to stdlib #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lihaoyi-databricks merged 1 commit into from
Jan 4, 2019
Merged

Add mod, max, and min to stdlib #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions sjsonnet/src/sjsonnet/Std.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,15 @@ object Std {
builtin("sqrt", "x"){ (wd, extVars, x: Double) =>
math.sqrt(x)
},
builtin("max", "a", "b"){ (wd, extVars, a: Double, b: Double) =>
math.max(a, b)
},
builtin("min", "a", "b"){ (wd, extVars, a: Double, b: Double) =>
math.min(a, b)
},
builtin("mod", "a", "b"){ (wd, extVars, a: Int, b: Int) =>
a % b
},

builtin("makeArray", "sz", "func"){ (wd, extVars, sz: Int, func: Applyer) =>
Val.Arr(
Expand Down
3 changes: 3 additions & 0 deletions sjsonnet/test/resources/test_suite/stdlib.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ std.assertEqual(std.sqrt(16), 4) &&
std.assertEqual(std.abs(33), 33) &&
std.assertEqual(std.abs(-33), 33) &&
std.assertEqual(std.abs(0), 0) &&
std.assertEqual(std.mod(20, 10), 0) &&
std.assertEqual(std.max(0, 1), 1) &&
std.assertEqual(std.min(0, 1), 0) &&

// Ordinary (non-test) code can define pi as 2*std.acos(0)
local pi = 3.14159265359;
Expand Down