merge

1 files changed, 4 insertions, 5 deletions

diff --git a/src/mem/slicc/ast/MachineAST.cc b/src/mem/slicc/ast/MachineAST.cc
index 2096db591..ae8026458 100644
--- a/src/mem/slicc/ast/MachineAST.cc
+++ b/src/mem/slicc/ast/MachineAST.cc
@@ -37,21 +37,20 @@
  */
 
 #include "mem/slicc/ast/MachineAST.hh"
+#include "mem/slicc/ast/FormalParamAST.hh"
 #include "mem/slicc/symbols/SymbolTable.hh"
 
 MachineAST::MachineAST(string* ident_ptr,
                        PairListAST* pairs_ptr,
-                       Vector<TypeFieldAST*>* config_params_ptr,
-                       std::vector<std::string*>* latency_vector,
+                       Vector<FormalParamAST*>* config_parameters,
                        DeclListAST* decl_list_ptr)
 
   : DeclAST(pairs_ptr)
 {
   m_ident_ptr = ident_ptr;
   m_pairs_ptr = pairs_ptr;
-  m_config_params_ptr = config_params_ptr;
+  m_config_parameters = config_parameters;
   m_decl_list_ptr = decl_list_ptr;
-  m_latency_vector = latency_vector;
 }
 
 MachineAST::~MachineAST()
@@ -69,7 +68,7 @@ void MachineAST::generate()
   g_sym_table.pushFrame();
 
   // Create a new machine
-  machine_ptr = new StateMachine(*m_ident_ptr, getLocation(), getPairs(), m_latency_vector);
+  machine_ptr = new StateMachine(*m_ident_ptr, getLocation(), getPairs(), m_config_parameters);
   g_sym_table.newCurrentMachine(machine_ptr);
 
   // Generate code for all the internal decls