From de685928e2f76f981e6c1670bbc004410a72f9b0 Mon Sep 17 00:00:00 2001
From: collin <collin.chin@berkeley.edu>
Date: Wed, 21 Apr 2021 15:20:22 -0700
Subject: [PATCH] rename stage -> phase

---
 compiler/src/lib.rs                            |  8 ++++----
 compiler/src/{stage.rs => phase.rs}            |  2 +-
 compiler/src/{stages => phases}/mod.rs         |  4 ++--
 .../src/{stages/stage.rs => phases/phase.rs}   | 18 +++++++++---------
 .../{stages => phases}/reducing_director.rs    |  0
 compiler/tests/type_inference/mod.rs           |  6 +++---
 6 files changed, 19 insertions(+), 19 deletions(-)
 rename compiler/src/{stage.rs => phase.rs} (97%)
 rename compiler/src/{stages => phases}/mod.rs (96%)
 rename compiler/src/{stages/stage.rs => phases/phase.rs} (84%)
 rename compiler/src/{stages => phases}/reducing_director.rs (100%)

diff --git a/compiler/src/lib.rs b/compiler/src/lib.rs
index 7e871e49ab..8676703570 100644
--- a/compiler/src/lib.rs
+++ b/compiler/src/lib.rs
@@ -57,11 +57,11 @@ pub use prelude::*;
 pub mod value;
 pub use value::*;
 
-pub mod stage;
-pub use stage::*;
+pub mod phase;
+pub use phase::*;
 
-pub mod stages;
-pub use stages::*;
+pub mod phases;
+pub use phases::*;
 
 pub mod option;
 pub use option::*;
diff --git a/compiler/src/stage.rs b/compiler/src/phase.rs
similarity index 97%
rename from compiler/src/stage.rs
rename to compiler/src/phase.rs
index ec96dac0fd..7f8d5dcbbd 100644
--- a/compiler/src/stage.rs
+++ b/compiler/src/phase.rs
@@ -16,6 +16,6 @@
 
 use leo_asg::Program;
 
-pub trait ASGStage {
+pub trait ASGPhase {
     fn apply(asg: &mut Program);
 }
diff --git a/compiler/src/stages/mod.rs b/compiler/src/phases/mod.rs
similarity index 96%
rename from compiler/src/stages/mod.rs
rename to compiler/src/phases/mod.rs
index 41658f96af..c409e2f4d5 100644
--- a/compiler/src/stages/mod.rs
+++ b/compiler/src/phases/mod.rs
@@ -19,5 +19,5 @@
 pub mod reducing_director;
 pub use reducing_director::*;
 
-pub mod stage;
-pub use stage::*;
+pub mod phase;
+pub use phase::*;
diff --git a/compiler/src/stages/stage.rs b/compiler/src/phases/phase.rs
similarity index 84%
rename from compiler/src/stages/stage.rs
rename to compiler/src/phases/phase.rs
index d388d5b19c..1423fa47fa 100644
--- a/compiler/src/stages/stage.rs
+++ b/compiler/src/phases/phase.rs
@@ -20,9 +20,9 @@ use crate::{CombineAstAsgDirector, CombinerOptions};
 use leo_asg::Program as AsgProgram;
 use leo_ast::{Ast, Program as AstProgram, ReconstructingReducer, ReducerError};
 
-macro_rules! stage {
-    ($stage_name:ident, $function:item) => {
-        pub struct $stage_name {
+macro_rules! phase {
+    ($phase_name:ident, $function:item) => {
+        pub struct $phase_name {
             in_circuit: bool,
         }
 
@@ -32,7 +32,7 @@ macro_rules! stage {
             $function
         }
 
-        impl ReconstructingReducer for $stage_name {
+        impl ReconstructingReducer for $phase_name {
             fn in_circuit(&self) -> bool {
                 self.in_circuit
             }
@@ -42,14 +42,14 @@ macro_rules! stage {
             }
         }
 
-        impl Default for $stage_name {
+        impl Default for $phase_name {
             fn default() -> Self {
                 Self { in_circuit: false }
             }
         }
 
-        impl $stage_name {
-            pub fn stage_ast(&self, ast: &AstProgram, asg: &AsgProgram) -> Result<Ast, ReducerError> {
+        impl $phase_name {
+            pub fn phase_ast(&self, ast: &AstProgram, asg: &AsgProgram) -> Result<Ast, ReducerError> {
                 Ok(Ast::new(CombineAstAsgDirector::new(Self::default(), Options{})
                     .reduce_program(ast, asg)?))
             }
@@ -57,8 +57,8 @@ macro_rules! stage {
     };
 }
 
-stage!(
-    TypeInferenceStage,
+phase!(
+    TypeInferencePhase,
     fn type_inference_enabled(&self) -> bool {
         true
     }
diff --git a/compiler/src/stages/reducing_director.rs b/compiler/src/phases/reducing_director.rs
similarity index 100%
rename from compiler/src/stages/reducing_director.rs
rename to compiler/src/phases/reducing_director.rs
diff --git a/compiler/tests/type_inference/mod.rs b/compiler/tests/type_inference/mod.rs
index a294b2500d..30f859b099 100644
--- a/compiler/tests/type_inference/mod.rs
+++ b/compiler/tests/type_inference/mod.rs
@@ -18,7 +18,7 @@ use crate::{assert_satisfied, parse_program};
 #[allow(unused)]
 use leo_asg::{new_context, Asg, AsgContext};
 use leo_ast::Ast;
-use leo_compiler::TypeInferenceStage;
+use leo_compiler::TypeInferencePhase;
 use leo_imports::ImportParser;
 use leo_parser::parser;
 
@@ -47,8 +47,8 @@ pub fn parse_program_ast(file_string: &str) -> Ast {
     let asg = Asg::new(thread_leaked_context(), &program, &mut ImportParser::default())
         .expect("Failed to create ASG from AST");
 
-    let new_ast = TypeInferenceStage::default()
-        .stage_ast(&program, &asg.into_repr())
+    let new_ast = TypeInferencePhase::default()
+        .phase_ast(&program, &asg.into_repr())
         .expect("Failed to produce type inference ast.");
 
     new_ast