refactor(ast)!: add top level expression type Expr::Root

Add `Expr::Root`, and use this to store top-level constraints in `Model` (instead of the current `Vec<Expr>`). Among other things, this allows partial evaluation of the top level of the model again. For more details, see the RFC: #596. Closes: #596
conjure-cp · Feb 4, 2025 · 59aa5fb · 59aa5fb
1 parent aa369f1
commit 59aa5fb
Show file tree

Hide file tree

Showing 204 changed files with 26,886 additions and 14,987 deletions.
diff --git a/conjure_oxide/examples/solver-hello-minion.rs b/conjure_oxide/examples/solver-hello-minion.rs
@@ -27,7 +27,7 @@ pub fn main() {
     let model = get_example_model("div-05").unwrap();
     println!(
         "Input model: \n {} \n",
-        pretty_expressions_as_top_level(&model.constraints)
+        pretty_expressions_as_top_level(&model.get_constraints_vec())
     );
 
     // TODO: We will have a nicer way to do this in the future
@@ -36,7 +36,7 @@ pub fn main() {
     let model = rewrite_model(&model, &rule_sets).unwrap();
     println!(
         "Rewritten model: \n {} \n",
-        pretty_expressions_as_top_level(&model.constraints)
+        pretty_expressions_as_top_level(&model.get_constraints_vec())
     );
 
     // To tell the `Solver` type what solver to use, you pass it a `SolverAdaptor`.

diff --git a/conjure_oxide/src/utils/essence_parser.rs b/conjure_oxide/src/utils/essence_parser.rs
@@ -39,7 +39,7 @@ pub fn parse_essence_file_native(
                         constraint_vec.push(parse_constraint(constraint, &source_code));
                     }
                 }
-                model.constraints.extend(constraint_vec);
+                model.add_constraints(constraint_vec);
             }
             "e_prime_label" => {}
             _ => {

diff --git a/conjure_oxide/tests/generated_tests.rs b/conjure_oxide/tests/generated_tests.rs
@@ -357,7 +357,7 @@ fn check_solutions_stage(
 }
 
 fn assert_vector_operators_have_partially_evaluated(model: &conjure_core::Model) {
-    for node in model.constraints.universe_bi() {
+    for node in model.universe_bi() {
         use conjure_core::ast::Expression::*;
         match node {
             Sum(_, ref vec) => assert_constants_leq_one(&node, vec),

diff --git a/conjure_oxide/tests/integration/basic/abs/0-simple/input.expected-parse.serialised.json b/conjure_oxide/tests/integration/basic/abs/0-simple/input.expected-parse.serialised.json
@@ -1,48 +1,56 @@
 {
-  "constraints": [
-    {
-      "Eq": [
-        {
-          "clean": false,
-          "etype": null
-        },
+  "constraints": {
+    "Root": [
+      {
+        "clean": false,
+        "etype": null
+      },
+      [
         {
-          "Abs": [
+          "Eq": [
             {
               "clean": false,
               "etype": null
             },
             {
-              "Atomic": [
+              "Abs": [
                 {
                   "clean": false,
                   "etype": null
                 },
                 {
-                  "Reference": {
-                    "UserName": "x"
-                  }
+                  "Atomic": [
+                    {
+                      "clean": false,
+                      "etype": null
+                    },
+                    {
+                      "Reference": {
+                        "UserName": "x"
+                      }
+                    }
+                  ]
                 }
               ]
-            }
-          ]
-        },
-        {
-          "Atomic": [
-            {
-              "clean": false,
-              "etype": null
             },
             {
-              "Literal": {
-                "Int": 1
-              }
+              "Atomic": [
+                {
+                  "clean": false,
+                  "etype": null
+                },
+                {
+                  "Literal": {
+                    "Int": 1
+                  }
+                }
+              ]
             }
           ]
         }
       ]
-    }
-  ],
+    ]
+  },
   "symbols": {
     "next_machine_name": 0,
     "table": [

diff --git a/conjure_oxide/tests/integration/basic/abs/0-simple/input.expected-rewrite.serialised.json b/conjure_oxide/tests/integration/basic/abs/0-simple/input.expected-rewrite.serialised.json
@@ -1,24 +1,32 @@
 {
-  "constraints": [
-    {
-      "FlatAbsEq": [
-        {
-          "clean": false,
-          "etype": null
-        },
-        {
-          "Literal": {
-            "Int": 1
-          }
-        },
+  "constraints": {
+    "Root": [
+      {
+        "clean": false,
+        "etype": null
+      },
+      [
         {
-          "Reference": {
-            "UserName": "x"
-          }
+          "FlatAbsEq": [
+            {
+              "clean": false,
+              "etype": null
+            },
+            {
+              "Literal": {
+                "Int": 1
+              }
+            },
+            {
+              "Reference": {
+                "UserName": "x"
+              }
+            }
+          ]
         }
       ]
-    }
-  ],
+    ]
+  },
   "symbols": {
     "next_machine_name": 0,
     "table": [

diff --git a/conjure_oxide/tests/integration/basic/abs/01-simple/input.expected-parse.serialised.json b/conjure_oxide/tests/integration/basic/abs/01-simple/input.expected-parse.serialised.json
@@ -1,79 +1,87 @@
 {
-  "constraints": [
-    {
-      "Eq": [
-        {
-          "clean": false,
-          "etype": null
-        },
+  "constraints": {
+    "Root": [
+      {
+        "clean": false,
+        "etype": null
+      },
+      [
         {
-          "Sum": [
+          "Eq": [
             {
               "clean": false,
               "etype": null
             },
-            [
-              {
-                "Abs": [
-                  {
-                    "clean": false,
-                    "etype": null
-                  },
+            {
+              "Sum": [
+                {
+                  "clean": false,
+                  "etype": null
+                },
+                [
                   {
-                    "Atomic": [
+                    "Abs": [
                       {
                         "clean": false,
                         "etype": null
                       },
                       {
-                        "Reference": {
-                          "UserName": "x"
-                        }
+                        "Atomic": [
+                          {
+                            "clean": false,
+                            "etype": null
+                          },
+                          {
+                            "Reference": {
+                              "UserName": "x"
+                            }
+                          }
+                        ]
                       }
                     ]
-                  }
-                ]
-              },
-              {
-                "Abs": [
-                  {
-                    "clean": false,
-                    "etype": null
                   },
                   {
-                    "Atomic": [
+                    "Abs": [
                       {
                         "clean": false,
                         "etype": null
                       },
                       {
-                        "Reference": {
-                          "UserName": "y"
-                        }
+                        "Atomic": [
+                          {
+                            "clean": false,
+                            "etype": null
+                          },
+                          {
+                            "Reference": {
+                              "UserName": "y"
+                            }
+                          }
+                        ]
                       }
                     ]
                   }
                 ]
-              }
-            ]
-          ]
-        },
-        {
-          "Atomic": [
-            {
-              "clean": false,
-              "etype": null
+              ]
             },
             {
-              "Literal": {
-                "Int": 10
-              }
+              "Atomic": [
+                {
+                  "clean": false,
+                  "etype": null
+                },
+                {
+                  "Literal": {
+                    "Int": 10
+                  }
+                }
+              ]
             }
           ]
         }
       ]
-    }
-  ],
+    ]
+  },
   "symbols": {
     "next_machine_name": 0,
     "table": [