Feat: remove old parser

clarity/src/vm/analysis/type_checker/v2_1/tests/mod.rs

@@ -473,12 +473,7 @@ fn test_define_trait(#[case] version: ClarityVersion, #[case] epoch: StacksEpoch
     let bad_expected = [
         ParseErrorKind::DefineTraitBadSignature,
         ParseErrorKind::DefineTraitBadSignature,
-        if epoch == StacksEpochId::Epoch20 || epoch == StacksEpochId::Epoch2_05 {
-            // the pre-2.1 parser returns less instructive errors
-            ParseErrorKind::ClosingParenthesisUnexpected
-        } else {
-            ParseErrorKind::UnexpectedToken(Token::Rparen)
-        },
+        ParseErrorKind::UnexpectedToken(Token::Rparen),
     ];
 
     let contract_identifier = QualifiedContractIdentifier::transient();

clarity/src/vm/ast/definition_sorter/tests.rs

@@ -36,7 +36,7 @@ fn test_clarity_versions_definition_sorter(#[case] version: ClarityVersion) {}
 
 fn run_scoped_parsing_helper(contract: &str, version: ClarityVersion) -> ParseResult<ContractAST> {
     let contract_identifier = QualifiedContractIdentifier::transient();
-    let pre_expressions = parser::v1::parse(contract)?;
+    let pre_expressions = parser::v2::parse(contract)?;
     let mut contract_ast = ContractAST::new(contract_identifier, pre_expressions);
     ExpressionIdentifier::run_pre_expression_pass(&mut contract_ast, version)?;
     DefinitionSorter::run_pass(&mut contract_ast, &mut (), version)?;

clarity/src/vm/ast/mod.rs

@@ -28,7 +28,6 @@ use stacks_common::types::StacksEpochId;
 use self::definition_sorter::DefinitionSorter;
 use self::errors::ParseResult;
 use self::expression_identifier::ExpressionIdentifier;
-use self::parser::v1::parse as parse_v1;
 use self::parser::v2::parse as parse_v2;
 use self::stack_depth_checker::{StackDepthChecker, VaryStackDepthChecker};
 use self::sugar_expander::SugarExpander;
@@ -58,13 +57,9 @@ pub fn parse(
 /// Parse a program based on which epoch is active
 fn parse_in_epoch(
     source_code: &str,
-    epoch_id: StacksEpochId,
+    _epoch_id: StacksEpochId,
 ) -> ParseResult<Vec<PreSymbolicExpression>> {
-    if epoch_id >= StacksEpochId::Epoch21 {
-        parse_v2(source_code)
-    } else {
-        parse_v1(source_code)
-    }
+    parse_v2(source_code)
 }
 
 /// This is the part of the AST parser that runs without respect to cost analysis, specifically
@@ -111,7 +106,7 @@ fn inner_build_ast<T: CostTracker>(
     source_code: &str,
     cost_track: &mut T,
     clarity_version: ClarityVersion,
-    epoch: StacksEpochId,
+    _epoch: StacksEpochId,
     error_early: bool,
 ) -> ParseResult<(ContractAST, Vec<Diagnostic>, bool)> {
     let cost_err = match runtime_cost(
@@ -124,20 +119,11 @@ fn inner_build_ast<T: CostTracker>(
         _ => None,
     };
 
-    let (pre_expressions, mut diagnostics, mut success) = if epoch >= StacksEpochId::Epoch21 {
-        if error_early {
-            let exprs = parser::v2::parse(source_code)?;
-            (exprs, Vec::new(), true)
-        } else {
-            parser::v2::parse_collect_diagnostics(source_code)
-        }
+    let (pre_expressions, mut diagnostics, mut success) = if error_early {
+        let exprs = parser::v2::parse(source_code)?;
+        (exprs, Vec::new(), true)
     } else {
-        let parse_result = parse_v1(source_code);
-        match parse_result {
-            Ok(pre_expressions) => (pre_expressions, vec![], true),
-            Err(error) if error_early => return Err(error),
-            Err(error) => (vec![], vec![error.diagnostic], false),
-        }
+        parser::v2::parse_collect_diagnostics(source_code)
     };
 
     if let Some(e) = cost_err {
@@ -322,7 +308,7 @@ mod test {
         )
         .expect_err("Contract should error in parsing");
 
-        let expected_err = ParseErrorKind::VaryExpressionStackDepthTooDeep;
+        let expected_err = ParseErrorKind::ExpressionStackDepthTooDeep;
         let expected_list_cost_state = UnitTestTracker {
             invoked_functions: vec![(ClarityCostFunction::AstParse, vec![500])],
             invocation_count: 1,
@@ -342,7 +328,7 @@ mod test {
         )
         .expect_err("Contract should error in parsing");
 
-        let expected_err = ParseErrorKind::VaryExpressionStackDepthTooDeep;
+        let expected_err = ParseErrorKind::ExpressionStackDepthTooDeep;
         let expected_list_cost_state = UnitTestTracker {
             invoked_functions: vec![(ClarityCostFunction::AstParse, vec![571])],
             invocation_count: 1,

clarity/src/vm/ast/parser/mod.rs

@@ -14,5 +14,4 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-pub mod v1;
 pub mod v2;