Add ==/!= operators for error instances.

zeek · Jun 12, 2024 · e0728cc · e0728cc
1 parent e2ab699
commit e0728cc
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 0 deletions.
diff --git a/hilti/toolchain/include/ast/forward.h b/hilti/toolchain/include/ast/forward.h
@@ -210,6 +210,8 @@ class HasLabel;
 
 namespace error {
 class Ctor;
+class Equal;
+class Unequal;
 class Description;
 } // namespace error
 

diff --git a/hilti/toolchain/include/ast/node-tag.h b/hilti/toolchain/include/ast/node-tag.h
@@ -229,6 +229,8 @@ constexpr Tag Unequal = 1106;
 namespace error {
 constexpr Tag Ctor = 1200;
 constexpr Tag Description = 1201;
+constexpr Tag Equal = 2702;
+constexpr Tag Unequal = 2703;
 } // namespace error
 
 namespace exception {

diff --git a/hilti/toolchain/include/ast/operators/error.h b/hilti/toolchain/include/ast/operators/error.h
@@ -10,6 +10,8 @@
 namespace hilti::operator_ {
 
 HILTI_NODE_OPERATOR(error, Ctor)
+HILTI_NODE_OPERATOR(error, Equal)
+HILTI_NODE_OPERATOR(error, Unequal)
 HILTI_NODE_OPERATOR(error, Description)
 
 } // namespace hilti::operator_
diff --git a/hilti/toolchain/include/ast/visitor-dispatcher.h b/hilti/toolchain/include/ast/visitor-dispatcher.h
@@ -173,6 +173,8 @@ class Dispatcher {
     virtual void operator()(hilti::operator_::enum_::CtorUnsigned* n) {}
     virtual void operator()(hilti::operator_::enum_::HasLabel* n) {}
     virtual void operator()(hilti::operator_::error::Ctor* n) {}
+    virtual void operator()(hilti::operator_::error::Equal* n) {}
+    virtual void operator()(hilti::operator_::error::Unequal* n) {}
     virtual void operator()(hilti::operator_::error::Description* n) {}
     virtual void operator()(hilti::operator_::exception::Ctor* n) {}
     virtual void operator()(hilti::operator_::exception::Description* n) {}

diff --git a/hilti/toolchain/src/ast/operators/error.cc b/hilti/toolchain/src/ast/operators/error.cc
@@ -30,6 +30,40 @@ class Ctor : public Operator {
 };
 HILTI_OPERATOR_IMPLEMENTATION(Ctor);
 
+class Equal : public Operator {
+public:
+    Signature signature(Builder* builder) const final {
+        return Signature{
+            .kind = Kind::Equal,
+            .op0 = {parameter::Kind::In, builder->typeError()},
+            .op1 = {parameter::Kind::In, builder->typeError()},
+            .result = {Constness::Const, builder->typeBool()},
+            .ns = "error",
+            .doc = "Compares two error descriptions lexicographically.",
+        };
+    }
+
+    HILTI_OPERATOR(hilti, error::Equal)
+};
+HILTI_OPERATOR_IMPLEMENTATION(Equal);
+
+class Unequal : public Operator {
+public:
+    Signature signature(Builder* builder) const final {
+        return Signature{
+            .kind = Kind::Unequal,
+            .op0 = {parameter::Kind::In, builder->typeError()},
+            .op1 = {parameter::Kind::In, builder->typeError()},
+            .result = {Constness::Const, builder->typeBool()},
+            .ns = "error",
+            .doc = "Compares two error descriptions lexicographically.",
+        };
+    }
+
+    HILTI_OPERATOR(hilti, error::Unequal)
+};
+HILTI_OPERATOR_IMPLEMENTATION(Unequal);
+
 class Description : public BuiltInMemberCall {
 public:
     Signature signature(Builder* builder) const final {

diff --git a/hilti/toolchain/src/compiler/codegen/operators.cc b/hilti/toolchain/src/compiler/codegen/operators.cc
@@ -311,6 +311,10 @@ struct Visitor : hilti::visitor::PreOrder {
         result = fmt("::hilti::rt::result::Error(%s)", args[0]);
     }
 
+    void operator()(operator_::error::Equal* n) final { result = binary(n, "=="); }
+
+    void operator()(operator_::error::Unequal* n) final { result = binary(n, "!="); }
+
     // Exception
 
     void operator()(operator_::exception::Ctor* n) final {