Fix merge

src/compiler/setup_inter.rs

@@ -66,7 +66,7 @@ impl SetupInterpreter {
         if !self.setup.get(&id.name()).unwrap().contains_key("final") {
             self.interpret_state_decl(
                 dsym,
-                &Identifier::from("final"),
+                &Identifier::new("final", dsym.clone()),
                 &Statement::Block(dsym.clone(), vec![]),
             )
         }

src/interpreter/mod.rs

@@ -82,7 +82,10 @@ impl<'a, F: Field + Hash> Interpreter<'a, F> {
         self.cur_frame.enter_machine(id.name());
 
         for (id, input_value) in input.iter() {
-            self.cur_frame.set_value(id, &Value::Field(*input_value));
+            self.cur_frame.set_value(
+                &Identifier::new(id, dsym.clone()),
+                &Value::Field(*input_value),
+            );
         }
 
         while next_state.is_some() {
@@ -232,7 +235,7 @@ impl<'a, F: Field + Hash> Interpreter<'a, F> {
         if self.cur_frame.get_state() == "final" {
             Some(Statement::StateDecl(
                 machine_dsym.clone(),
-                self.cur_frame.get_state().into(),
+                Identifier::new(self.cur_frame.get_state(), machine_dsym.clone()),
                 Box::new(Statement::Block(machine_dsym.clone(), vec![])),
             ))
         } else {

src/parser/ast/mod.rs

@@ -123,6 +123,14 @@ impl Debug for DebugSymRef {
     }
 }
 
+impl Eq for DebugSymRef {}
+
+impl PartialEq for DebugSymRef {
+    fn eq(&self, other: &Self) -> bool {
+        self.start == other.start && self.end == other.end && self.file.name() == other.file.name()
+    }
+}
+
 #[derive(Clone, PartialEq, Eq)]
 pub struct Identifier(pub String, pub i32, pub DebugSymRef);
 impl Identifier {