feat(type_inference): added NumericDefaultInt cons

- Added NumericDefaultInt constraint - Updated IntegerLit semantic node to have monotype value - Updated semantic analysis to convert all NumericDefaultInt to int in final pass
influxdata · Nov 11, 2020 · 3b67afd · 3b67afd
1 parent 2e0f9dd
commit 3b67afd
Show file tree

Hide file tree

Showing 38 changed files with 1,068 additions and 235 deletions.
diff --git a/compiler/compiler.go b/compiler/compiler.go
@@ -493,6 +493,11 @@ func compile(n semantic.Node, subst map[uint64]semantic.MonoType, scope Scope) (
 		return &integerEvaluator{
 			i: n.Value,
 		}, nil
+	case *semantic.PolyNumericLiteral:
+		return &integerEvaluator{
+			i: n.Value,
+		}, nil
+
 	case *semantic.UnsignedIntegerLiteral:
 		return &unsignedIntegerEvaluator{
 			i: n.Value,

diff --git a/docs/SPEC.md b/docs/SPEC.md
@@ -616,6 +616,11 @@ Int, Uint, and Float types are Divisible.
 
 Int, Uint, and Float types are Numeric.
 
+##### Numeric Default Int Constraint
+
+Integer literals are polymorphic and can be interpreted as Int, Uint, or Float types.
+This constraint is used to infer the type of integer literals based on the context of the program.
+
 ##### Comparable Constraint
 
 Comparable types are those the binary comparison operators `<`, `<=`, `>`, or `>=` accept.

diff --git a/internal/fbsemantic/semantic.fbs b/internal/fbsemantic/semantic.fbs
@@ -94,6 +94,7 @@ enum Kind : ubyte {
   Record,
   Negatable,
   Timeable,
+  NumericDefaultInt,
 }
 
 table Constraint {
@@ -133,6 +134,7 @@ union Expression {
   DateTimeLiteral,
   DurationLiteral,
   FloatLiteral,
+  PolyNumericLiteral,
   IntegerLiteral,
   StringLiteral,
   RegexpLiteral,
@@ -397,6 +399,12 @@ table DurationLiteral {
   value:[Duration];
 }
 
+table PolyNumericLiteral {
+  loc:SourceLocation;
+  value:int64;
+  typ:MonoType;
+}
+
 table IntegerLiteral {
   loc:SourceLocation;
   value:int64;

diff --git a/internal/fbsemantic/semantic_generated.go b/internal/fbsemantic/semantic_generated.go
diff --git a/interpreter/interpreter.go b/interpreter/interpreter.go
@@ -575,7 +575,7 @@ func (itrp *Interpreter) doLiteral(lit semantic.Literal) (values.Value, error) {
 		return values.NewDuration(dur), nil
 	case *semantic.FloatLiteral:
 		return values.NewFloat(l.Value), nil
-	case *semantic.IntegerLiteral:
+	case *semantic.PolyNumericLiteral:
 		return values.NewInt(l.Value), nil
 	case *semantic.UnsignedIntegerLiteral:
 		return values.NewUInt(l.Value), nil
@@ -1140,7 +1140,7 @@ func resolveValue(v values.Value) (semantic.Node, bool, error) {
 			Value: v.Str(),
 		}, true, nil
 	case semantic.Int:
-		return &semantic.IntegerLiteral{
+		return &semantic.PolyNumericLiteral{
 			Value: v.Int(),
 		}, true, nil
 	case semantic.UInt:

diff --git a/interpreter/interpreter_test.go b/interpreter/interpreter_test.go
@@ -53,14 +53,14 @@ func TestEval(t *testing.T) {
 		{
 			name: "string interpolation missing field",
 			query: `
-				r = makeRecord(o: {a: "foo", b: 42})
+				r = o: {a: "foo", b: 42}
 				"r._value = ${r._value}"`,
 			wantErr: any,
 		},
 		{
 			name: "string interpolation field has wrong type",
 			query: `
-				r = makeRecord(o: {a: "foo", b: 42})
+				r = o: {a: "foo", b: 42}
 				"r._value = ${r.b}"`,
 			wantErr: any,
 		},
@@ -287,7 +287,7 @@ func TestEval(t *testing.T) {
 			name: "array index expression out of bounds high",
 			query: `
 				a = [1, 2, 3]
-				i = 3 
+				i = 3
 				x = a[i]
 			`,
 			wantErr: any,
@@ -439,31 +439,31 @@ func TestEval_Operator_Precedence(t *testing.T) {
 		want values.Value
 	}{
 		{
-			src:  "2.0 * 3.0 ^ 2.0",
+			src:  "2 * 3 ^ 2",
 			want: values.NewFloat(18.0),
 		},
 		{
-			src:  "(2.0 * 3.0) ^ 2.0",
+			src:  "(2 * 3) ^ 2",
 			want: values.NewFloat(36.0),
 		},
 		{
-			src:  "4.0 / 2.0 ^ 2.0",
+			src:  "4 / 2 ^ 2",
 			want: values.NewFloat(1.0),
 		},
 		{
-			src:  "(4.0 / 2.0) ^ 2.0",
+			src:  "(4 / 2) ^ 2",
 			want: values.NewFloat(4.0),
 		},
 		{
-			src:  "2.0 % 4.0 ^ 2.0",
+			src:  "2 % 4 ^ 2",
 			want: values.NewFloat(2.0),
 		},
 		{
-			src:  "(2.0 % 4.0) ^ 2.0",
+			src:  "(2 % 4) ^ 2",
 			want: values.NewFloat(4.0),
 		},
 		{
-			src:  "1.0 + 2.0 * 3.0",
+			src:  "1 + 2 * 3.0",
 			want: values.NewFloat(7.0),
 		},
 		{
@@ -503,35 +503,35 @@ func TestEval_Operator_Precedence(t *testing.T) {
 			want: values.NewFloat(6.0),
 		},
 		{
-			src:  "1.0 + 2.0 < 4.0",
+			src:  "1 + 2 < 4",
 			want: values.NewBool(true),
 		},
 		{
-			src:  "(1.0 + 2.0) < 4.0",
+			src:  "(1 + 2) < 4",
 			want: values.NewBool(true),
 		},
 		{
-			src:  "1.0 + 2.0 <= 4.0",
+			src:  "1 + 2 <= 4",
 			want: values.NewBool(true),
 		},
 		{
-			src:  "(1.0 + 2.0) <= 4.0",
+			src:  "(1 + 2) <= 4",
 			want: values.NewBool(true),
 		},
 		{
-			src:  "1.0 + 2.0 > 4.0",
+			src:  "1 + 2 > 4",
 			want: values.NewBool(false),
 		},
 		{
-			src:  "(1.0 + 2.0) > 4.0",
+			src:  "(1 + 2) > 4",
 			want: values.NewBool(false),
 		},
 		{
-			src:  "1.0 + 2.0 >= 4.0",
+			src:  "1 + 2 >= 4",
 			want: values.NewBool(false),
 		},
 		{
-			src:  "(1.0 + 2.0) >= 4.0",
+			src:  "(1 + 2) >= 4",
 			want: values.NewBool(false),
 		},
 		{
@@ -666,9 +666,9 @@ func TestInterpreter_MultipleEval(t *testing.T) {
 							Value: values.NewInt(2),
 							Node: &semantic.ExpressionStatement{
 								Expression: &semantic.BinaryExpression{
-									Left:     &semantic.IntegerLiteral{Value: 1},
+									Left:     &semantic.PolyNumericLiteral{Value: 1},
 									Operator: ast.AdditionOperator,
-									Right:    &semantic.IntegerLiteral{Value: 1},
+									Right:    &semantic.PolyNumericLiteral{Value: 1},
 								},
 							},
 						},
@@ -686,9 +686,9 @@ func TestInterpreter_MultipleEval(t *testing.T) {
 							Value: values.NewInt(2),
 							Node: &semantic.ExpressionStatement{
 								Expression: &semantic.BinaryExpression{
-									Left:     &semantic.IntegerLiteral{Value: 1},
+									Left:     &semantic.PolyNumericLiteral{Value: 1},
 									Operator: ast.AdditionOperator,
-									Right:    &semantic.IntegerLiteral{Value: 1},
+									Right:    &semantic.PolyNumericLiteral{Value: 1},
 								},
 							},
 						},
@@ -709,7 +709,7 @@ func TestInterpreter_MultipleEval(t *testing.T) {
 									Property: "yield",
 								},
 								Arguments: &semantic.ObjectExpression{Properties: []*semantic.Property{}},
-								Pipe:      &semantic.IntegerLiteral{Value: 0},
+								Pipe:      &semantic.PolyNumericLiteral{Value: 0},
 							},
 						},
 						{

diff --git a/libflux/c/main.c b/libflux/c/main.c
@@ -85,7 +85,7 @@ void test_semantic() {
 
   {
     printf("Parsing to AST\n");
-    struct flux_ast_pkg_t *ast_pkg_foo = flux_parse("test", "package foo\nx = 1 + 1.0");
+    struct flux_ast_pkg_t *ast_pkg_foo = flux_parse("test", "package foo\nx = 1 + \"1.0\"");
     assert(ast_pkg_foo !=  NULL);
 
     printf("Analyzing (expect failure)\n");
@@ -115,7 +115,7 @@ void test_semantic() {
 
   {
     printf("Parsing to AST\n");
-    struct flux_ast_pkg_t *ast_pkg_foo = flux_parse("test", "package foo\nx = 1 + 1.0");
+    struct flux_ast_pkg_t *ast_pkg_foo = flux_parse("test", "package foo\nx = 1 + \"1.0\"");
     assert(ast_pkg_foo !=  NULL);
     printf("Find variable type v (expect failure)\n");
     struct flux_buffer_t buf;