fix(eval): Prefer formatting numbers in normal form if possible

thesephist · May 26, 2021 · 5d7d5dd · 5d7d5dd
1 parent 65bf742
commit 5d7d5dd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/SPEC.md b/SPEC.md
@@ -30,7 +30,7 @@ Literal: NumberLiteral | StringLiteral
   | BooleanLiteral | FunctionLiteral
   | ObjectLiteral | ListLiteral
 
-NumberLiteral: (0-9)+ ['.' (0-9)+]
+NumberLiteral: (0-9)+ ['.' (0-9)+] ['e' [+-]? (0-9)+]
 StringLiteral: '\'' (.*) '\''
 
 BooleanLiteral: 'true' | 'false'

diff --git a/pkg/ink/eval.go b/pkg/ink/eval.go
@@ -33,6 +33,11 @@ func isIntable(n NumberValue) bool {
 // Utility func to get a consistent, language spec-compliant
 // string representation of numbers
 func nToS(f float64) string {
+	// Prefer exact integer form if possible
+	if i := int64(f); f == float64(i) {
+		return strconv.FormatInt(i, 10)
+	}
+
 	return strconv.FormatFloat(f, 'g', -1, 64)
 }