diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Meta.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Meta.enso index e941a17cb307..c80cf47b0a79 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Meta.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Meta.enso @@ -271,16 +271,6 @@ Any.is_same_object_as self value = is_same_object self value Any.is_a : Any -> Boolean Any.is_a self typ = is_a self typ -## UNSTABLE - ADVANCED - - Checks if `self` is an instance of `typ`. - - Arguments: - - typ: The type to check `self` against. -Any.is_an : Any -> Boolean -Any.is_an self typ = is_a self typ - ## UNSTABLE ADVANCED @@ -289,17 +279,7 @@ Any.is_an self typ = is_a self typ Arguments: - typ: The type to check `self` against. Base.Error.is_a : Any -> Boolean -Base.Error.is_a self typ = self.is_an typ - -## UNSTABLE - ADVANCED - - Checks if `self` is an instance of `typ`. - - Arguments: - - typ: The type to check `self` against. -Base.Error.is_an : Any -> Boolean -Base.Error.is_an self typ = typ==Any || typ==Base.Error +Base.Error.is_a self typ = typ==Any || typ==Base.Error ## UNSTABLE ADVANCED @@ -348,17 +328,6 @@ java_instance_check value typ = typ_java = get_polyglot_language typ == "java" val_java && typ_java && Base.Java.is_instance value typ -## UNSTABLE - ADVANCED - - Checks if `value` is an instance of `typ`. - - Arguments: - - value: The value to check for being an instance of `typ`. - - typ: The type to check `self` against. -is_an : Any -> Any -> Boolean -is_an value typ = is_a value typ - ## UNSTABLE ADVANCED diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Table.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Table.enso index 50e2bb831866..abc147df8255 100644 --- a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Table.enso +++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Table.enso @@ -705,7 +705,7 @@ type Table agg = p.second new_name = p.first Aggregate_Helper.make_aggregate_column self agg new_name . catch - partitioned = results.partition (_.is_an Internal_Column_Data) + partitioned = results.partition (_.is_a Internal_Column_Data) ## When working on join we may encounter further issues with having aggregate columns exposed directly, it may be useful to re-use the `lift_aggregate` method to push the aggregates into a diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Excel/Range.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Excel/Range.enso index ff3d5b7a4d50..e945601095d2 100644 --- a/distribution/lib/Standard/Table/0.0.0-dev/src/Excel/Range.enso +++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Excel/Range.enso @@ -79,7 +79,7 @@ type Excel_Range unchanged. column_index : (Text|Integer) -> Integer column_index column = - if column.is_an Integer then column else Java_Range.parseA1Column column + if column.is_a Integer then column else Java_Range.parseA1Column column ## Creates a Range from an address. from_address : Text -> Excel_Range diff --git a/test/Table_Tests/src/Aggregate_Spec.enso b/test/Table_Tests/src/Aggregate_Spec.enso index 2c2ffe6b4800..38e786ba9fa4 100644 --- a/test/Table_Tests/src/Aggregate_Spec.enso +++ b/test/Table_Tests/src/Aggregate_Spec.enso @@ -1326,14 +1326,14 @@ aggregate_spec prefix table empty_table table_builder materialize is_database te new_table = table.aggregate [Group_By "Key", Concatenate "Value"] problems = Warning.get_all new_table . map .value problems.length . should_equal 1 - problems.at 0 . is_an Invalid_Aggregation_Data . should_be_true + problems.at 0 . is_a Invalid_Aggregation_Data . should_be_true problems.at 0 . rows . length . should_equal 15 Test.specify "should merge Floating Point Grouping warnings" <| new_table = table.aggregate [Group_By "Float", Count Nothing] problems = Warning.get_all new_table . map .value problems.length . should_equal 1 - problems.at 0 . is_an Floating_Point_Grouping_Data . should_be_true + problems.at 0 . is_a Floating_Point_Grouping_Data . should_be_true problems.at 0 . rows . length . should_equal 15 if is_database then diff --git a/test/Tests/src/Semantic/Meta_Spec.enso b/test/Tests/src/Semantic/Meta_Spec.enso index 073b6acdd810..1dd189d3ba0c 100644 --- a/test/Tests/src/Semantic/Meta_Spec.enso +++ b/test/Tests/src/Semantic/Meta_Spec.enso @@ -44,47 +44,47 @@ spec = Test.group "Meta-Value Manipulation" <| meta_err.is_a Meta.Error_Data . should_be_true meta_err.value . should_equal "My Error" Test.specify "should allow checking if a value is of a certain type" <| - 1.is_an Any . should_be_true - 1.2.is_an Any . should_be_true - (My_Type_Data 1 "foo" Nothing).is_an Any . should_be_true + 1.is_a Any . should_be_true + 1.2.is_a Any . should_be_true + (My_Type_Data 1 "foo" Nothing).is_a Any . should_be_true - Array.is_an Array . should_be_true - [].to_array.is_an Array . should_be_true + Array.is_a Array . should_be_true + [].to_array.is_a Array . should_be_true [].to_array.is_a Decimal . should_be_false [1,2,3].is_a Vector.Vector . should_be_true - [1,2,3].is_an Array . should_be_false + [1,2,3].is_a Array . should_be_false Boolean.is_a Boolean . should_be_true True.is_a Boolean . should_be_true False.is_a Boolean . should_be_true - True.is_an Integer . should_be_false + True.is_a Integer . should_be_false "".is_a Text . should_be_true "".is_a Decimal . should_be_false - 1.is_an Array . should_be_false - 1.is_an Integer . should_be_true + 1.is_a Array . should_be_false + 1.is_a Integer . should_be_true 1.is_a Number . should_be_true 1.is_a Decimal . should_be_false 1.0.is_a Number . should_be_true 1.0.is_a Decimal . should_be_true - 1.0.is_an Integer . should_be_false + 1.0.is_a Integer . should_be_false 1.0.is_a Text . should_be_false random_gen = Random.new Meta.is_a random_gen Polyglot . should_be_true - Meta.is_an random_gen Integer . should_be_false + Meta.is_a random_gen Integer . should_be_false (My_Type_Data 1 "foo" Nothing).is_a My_Type_Data . should_be_true (My_Type_Data 1 "foo" Nothing).is_a Test_Type_Data . should_be_false (My_Type_Data 1 "foo" Nothing).is_a Number . should_be_false err = Error.throw "Error Value" - 1.is_an Error . should_be_false - err.is_an Error . should_be_true + 1.is_a Error . should_be_false + err.is_a Error . should_be_true err.is_a Text . should_be_false - Meta.is_an err Error . should_be_true + Meta.is_a err Error . should_be_true Meta.is_a err Text . should_be_false Meta.is_a Date.now Date.Date . should_be_true