Skip to content

Fix the formatting directives to support what's documented in cel-spec #1232

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix the formatting directives to support what's documented in cel-spec #1232

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
8 changes: 4 additions & 4 deletions ext/formatting_v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,13 +245,13 @@ func (c *stringFormatterV2) Fixed(precision int) func(ref.Val) (string, error) {
if !ok {
return "", fmt.Errorf("type conversion error from '%s' to '%s'", arg.Type(), types.IntType)
}
return fmt.Sprintf(fmtStr, argInt), nil
return fmt.Sprintf(fmtStr, float64(argInt)), nil
case types.UintType:
argUint, ok := arg.Value().(uint64)
if !ok {
return "", fmt.Errorf("type conversion error from '%s' to '%s'", arg.Type(), types.UintType)
}
return fmt.Sprintf(fmtStr, argUint), nil
return fmt.Sprintf(fmtStr, float64(argUint)), nil
case types.DoubleType:
argDbl, ok := arg.Value().(float64)
if !ok {
Expand Down Expand Up @@ -283,13 +283,13 @@ func (c *stringFormatterV2) Scientific(precision int) func(ref.Val) (string, err
if !ok {
return "", fmt.Errorf("type conversion error from '%s' to '%s'", arg.Type(), types.IntType)
}
return fmt.Sprintf(fmtStr, argInt), nil
return fmt.Sprintf(fmtStr, float64(argInt)), nil
case types.UintType:
argUint, ok := arg.Value().(uint64)
if !ok {
return "", fmt.Errorf("type conversion error from '%s' to '%s'", arg.Type(), types.UintType)
}
return fmt.Sprintf(fmtStr, argUint), nil
return fmt.Sprintf(fmtStr, float64(argUint)), nil
case types.DoubleType:
argDbl, ok := arg.Value().(float64)
if !ok {
Expand Down
54 changes: 52 additions & 2 deletions ext/formatting_v2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,23 @@ func TestStringFormatV2(t *testing.T) {
formatArgs: `"percent"`,
expectedOutput: "%escaped percent%",
expectedRuntimeCost: 12,
expectedEstimatedCost: checker.CostEstimate{Min: 12, Max: 12},
expectedEstimatedCost: checker.FixedCostEstimate(12),
},
{
name: "fixed point formatting clause",
format: "%.3f",
formatArgs: "1.2345",
expectedOutput: "1.234",
expectedRuntimeCost: 11,
expectedEstimatedCost: checker.CostEstimate{Min: 11, Max: 11},
expectedEstimatedCost: checker.FixedCostEstimate(11),
},
{
name: "fixed point formatting clause with int",
format: "%.3f + %.2f",
formatArgs: "1, 1u",
expectedOutput: "1.000 + 1.00",
expectedRuntimeCost: 12,
expectedEstimatedCost: checker.FixedCostEstimate(12),
},
{
name: "binary formatting clause",
Expand Down Expand Up @@ -262,6 +270,22 @@ func TestStringFormatV2(t *testing.T) {
expectedRuntimeCost: 11,
expectedEstimatedCost: checker.CostEstimate{Min: 11, Max: 11},
},
{
name: "scientific notation formatting clause with uint",
format: "%.4e",
formatArgs: "1052u",
expectedOutput: "1.0520e+03",
expectedRuntimeCost: 11,
expectedEstimatedCost: checker.CostEstimate{Min: 11, Max: 11},
},
{
name: "scientific notation formatting clause with int",
format: "%.5e",
formatArgs: "1052",
expectedOutput: "1.05200e+03",
expectedRuntimeCost: 11,
expectedEstimatedCost: checker.CostEstimate{Min: 11, Max: 11},
},
{
name: "default precision for fixed-point clause",
format: "%f",
Expand Down Expand Up @@ -554,6 +578,19 @@ func TestStringFormatV2(t *testing.T) {
expectedRuntimeCost: 13,
expectedEstimatedCost: checker.CostEstimate{Min: 13, Max: 13},
},
{
name: "dyntype NaN/infinity support for decimal",
format: "NaN: %d, infinity: %d, -infinity: %d",
formatArgs: `dynNaN, dynInf, dynNegInf`,
dynArgs: map[string]any{
"dynNaN": math.NaN(),
"dynInf": math.Inf(1),
"dynNegInf": math.Inf(-1),
},
expectedOutput: "NaN: NaN, infinity: Infinity, -infinity: -Infinity",
expectedRuntimeCost: 17,
expectedEstimatedCost: checker.FixedCostEstimate(17),
},
{
name: "dyntype NaN/infinity support for fixed-point",
format: "NaN: %f, infinity: %f",
Expand All @@ -566,6 +603,19 @@ func TestStringFormatV2(t *testing.T) {
expectedRuntimeCost: 15,
expectedEstimatedCost: checker.CostEstimate{Min: 15, Max: 15},
},
{
name: "dyntype NaN/infinity support for scientific",
format: "NaN: %e, infinity: %e, -infinity: %e",
formatArgs: `dynNaN, dynInf, dynNegInf`,
dynArgs: map[string]any{
"dynNaN": math.NaN(),
"dynInf": math.Inf(1),
"dynNegInf": math.Inf(-1),
},
expectedOutput: "NaN: NaN, infinity: Infinity, -infinity: -Infinity",
expectedRuntimeCost: 17,
expectedEstimatedCost: checker.FixedCostEstimate(17),
},
{
name: "dyntype support for timestamp",
format: "dyntype timestamp: %s",
Expand Down