refactor(ast)!: refactor SymbolTable interface to hide implementati…

…on details Change the `SymbolTable` to be a struct with private members, and create a new interface to interact with it. This hides the fact that the `SymbolTable` is a `BTreeMap`. While the symbol table is a simple `BTreeMap` both before and after this commit, the implementation of this is likely to change multiple times in the future. In particular, this commit is preparation for adding `lettings` and `givens` to the symbol table.
conjure-cp · Jan 30, 2025 · e615d7d · e615d7d
1 parent 76606ac
commit e615d7d
Show file tree

Hide file tree

Showing 184 changed files with 8,581 additions and 8,094 deletions.
diff --git a/conjure_oxide/src/utils/essence_parser.rs b/conjure_oxide/src/utils/essence_parser.rs
@@ -5,9 +5,7 @@ use std::sync::{Arc, RwLock};
 use tree_sitter::{Node, Parser, Tree};
 use tree_sitter_essence::LANGUAGE;
 
-use conjure_core::ast::{
-    Atom, DecisionVariable, Domain, Expression, Literal, Name, Range, SymbolTable,
-};
+use conjure_core::ast::{Atom, DecisionVariable, Domain, Expression, Literal, Name, Range};
 
 use crate::utils::conjure::EssenceParseError;
 use conjure_core::context::Context;
@@ -72,7 +70,7 @@ fn parse_find_statement(
     find_statement_list: Node,
     source_code: &str,
 ) -> BTreeMap<Name, DecisionVariable> {
-    let mut symbol_table = SymbolTable::new();
+    let mut vars = BTreeMap::new();
 
     for find_statement in named_children(&find_statement_list) {
         let mut temp_symbols = BTreeSet::new();
@@ -92,10 +90,10 @@ fn parse_find_statement(
 
         for name in temp_symbols {
             let decision_variable = DecisionVariable::new(domain.clone());
-            symbol_table.insert(Name::UserName(String::from(name)), decision_variable);
+            vars.insert(Name::UserName(String::from(name)), decision_variable);
         }
     }
-    symbol_table
+    vars
 }
 
 fn parse_domain(domain: Node, source_code: &str) -> Domain {

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
@@ -43,24 +43,26 @@
       ]
     }
   ],
-  "next_var": 0,
-  "variables": [
-    [
-      {
-        "UserName": "x"
-      },
-      {
-        "domain": {
-          "IntDomain": [
-            {
-              "Bounded": [
-                -2,
-                3
-              ]
-            }
-          ]
+  "symbols": {
+    "next_machine_name": 0,
+    "variables": [
+      [
+        {
+          "UserName": "x"
+        },
+        {
+          "domain": {
+            "IntDomain": [
+              {
+                "Bounded": [
+                  -2,
+                  3
+                ]
+              }
+            ]
+          }
         }
-      }
+      ]
     ]
-  ]
+  }
 }
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
@@ -19,24 +19,26 @@
       ]
     }
   ],
-  "next_var": 0,
-  "variables": [
-    [
-      {
-        "UserName": "x"
-      },
-      {
-        "domain": {
-          "IntDomain": [
-            {
-              "Bounded": [
-                -2,
-                3
-              ]
-            }
-          ]
+  "symbols": {
+    "next_machine_name": 0,
+    "variables": [
+      [
+        {
+          "UserName": "x"
+        },
+        {
+          "domain": {
+            "IntDomain": [
+              {
+                "Bounded": [
+                  -2,
+                  3
+                ]
+              }
+            ]
+          }
         }
-      }
+      ]
     ]
-  ]
+  }
 }
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
@@ -74,41 +74,43 @@
       ]
     }
   ],
-  "next_var": 0,
-  "variables": [
-    [
-      {
-        "UserName": "x"
-      },
-      {
-        "domain": {
-          "IntDomain": [
-            {
-              "Bounded": [
-                -5,
-                5
-              ]
-            }
-          ]
+  "symbols": {
+    "next_machine_name": 0,
+    "variables": [
+      [
+        {
+          "UserName": "x"
+        },
+        {
+          "domain": {
+            "IntDomain": [
+              {
+                "Bounded": [
+                  -5,
+                  5
+                ]
+              }
+            ]
+          }
         }
-      }
-    ],
-    [
-      {
-        "UserName": "y"
-      },
-      {
-        "domain": {
-          "IntDomain": [
-            {
-              "Bounded": [
-                -5,
-                5
-              ]
-            }
-          ]
+      ],
+      [
+        {
+          "UserName": "y"
+        },
+        {
+          "domain": {
+            "IntDomain": [
+              {
+                "Bounded": [
+                  -5,
+                  5
+                ]
+              }
+            ]
+          }
         }
-      }
+      ]
     ]
-  ]
+  }
 }
diff --git a/conjure_oxide/tests/integration/basic/abs/01-simple/input.expected-rewrite.serialised.json b/conjure_oxide/tests/integration/basic/abs/01-simple/input.expected-rewrite.serialised.json
@@ -97,75 +97,77 @@
       ]
     }
   ],
-  "next_var": 2,
-  "variables": [
-    [
-      {
-        "MachineName": 0
-      },
-      {
-        "domain": {
-          "IntDomain": [
-            {
-              "Bounded": [
-                0,
-                5
-              ]
-            }
-          ]
+  "symbols": {
+    "next_machine_name": 2,
+    "variables": [
+      [
+        {
+          "MachineName": 0
+        },
+        {
+          "domain": {
+            "IntDomain": [
+              {
+                "Bounded": [
+                  0,
+                  5
+                ]
+              }
+            ]
+          }
         }
-      }
-    ],
-    [
-      {
-        "MachineName": 1
-      },
-      {
-        "domain": {
-          "IntDomain": [
-            {
-              "Bounded": [
-                0,
-                5
-              ]
-            }
-          ]
+      ],
+      [
+        {
+          "MachineName": 1
+        },
+        {
+          "domain": {
+            "IntDomain": [
+              {
+                "Bounded": [
+                  0,
+                  5
+                ]
+              }
+            ]
+          }
         }
-      }
-    ],
-    [
-      {
-        "UserName": "x"
-      },
-      {
-        "domain": {
-          "IntDomain": [
-            {
-              "Bounded": [
-                -5,
-                5
-              ]
-            }
-          ]
+      ],
+      [
+        {
+          "UserName": "x"
+        },
+        {
+          "domain": {
+            "IntDomain": [
+              {
+                "Bounded": [
+                  -5,
+                  5
+                ]
+              }
+            ]
+          }
         }
-      }
-    ],
-    [
-      {
-        "UserName": "y"
-      },
-      {
-        "domain": {
-          "IntDomain": [
-            {
-              "Bounded": [
-                -5,
-                5
-              ]
-            }
-          ]
+      ],
+      [
+        {
+          "UserName": "y"
+        },
+        {
+          "domain": {
+            "IntDomain": [
+              {
+                "Bounded": [
+                  -5,
+                  5
+                ]
+              }
+            ]
+          }
         }
-      }
+      ]
     ]
-  ]
+  }
 }