parser: mv program parser

Author: tcoratger

crates/leanVm/src/parser/mod.rs

@@ -1,7 +1,7 @@
 use std::collections::BTreeMap;
 
 use p3_field::{PrimeCharacteristicRing, PrimeField};
-use pest::{Parser, iterators::Pair};
+use pest::iterators::Pair;
 use pest_derive::Parser;
 
 use crate::{
@@ -15,46 +15,15 @@ use crate::{
 
 pub mod error;
 pub use error::*;
+pub mod utils;
+pub(crate) use utils::*;
+pub mod program;
+pub use program::*;
 
 #[derive(Parser, Debug)]
 #[grammar = "grammar.pest"]
 pub struct LangParser;
 
-pub fn parse_program(input: &str) -> Result<Program, ParseError> {
-    let input = remove_comments(input);
-    let mut pairs = LangParser::parse(Rule::program, &input)?;
-    let program_pair = pairs.next().unwrap();
-
-    let mut constants = BTreeMap::new();
-    let mut functions = BTreeMap::new();
-    let mut trash_var_count = 0;
-
-    for pair in program_pair.into_inner() {
-        match pair.as_rule() {
-            Rule::constant_declaration => {
-                let (name, value) = parse_constant_declaration(pair, &constants)?;
-                constants.insert(name, value);
-            }
-            Rule::function => {
-                let function = parse_function(pair, &constants, &mut trash_var_count)?;
-                functions.insert(function.name.clone(), function);
-            }
-            Rule::EOI => break,
-            _ => {}
-        }
-    }
-
-    Ok(Program { functions })
-}
-
-fn remove_comments(input: &str) -> String {
-    input
-        .lines()
-        .map(|line| line.find("//").map_or(line, |pos| &line[..pos]))
-        .collect::<Vec<_>>()
-        .join("\n")
-}
-
 fn parse_constant_declaration(
     pair: Pair<'_, Rule>,
     constants: &BTreeMap<String, usize>,

crates/leanVm/src/parser/program.rs

@@ -0,0 +1,35 @@
+use std::collections::BTreeMap;
+
+use pest::Parser;
+
+use super::{
+    LangParser, ParseError, Rule, parse_constant_declaration, parse_function, remove_comments,
+};
+use crate::parser::Program;
+
+pub fn parse_program(input: &str) -> Result<Program, ParseError> {
+    let input = remove_comments(input);
+    let mut pairs = LangParser::parse(Rule::program, &input)?;
+    let program_pair = pairs.next().unwrap();
+
+    let mut constants = BTreeMap::new();
+    let mut functions = BTreeMap::new();
+    let mut trash_var_count = 0;
+
+    for pair in program_pair.into_inner() {
+        match pair.as_rule() {
+            Rule::constant_declaration => {
+                let (name, value) = parse_constant_declaration(pair, &constants)?;
+                constants.insert(name, value);
+            }
+            Rule::function => {
+                let function = parse_function(pair, &constants, &mut trash_var_count)?;
+                functions.insert(function.name.clone(), function);
+            }
+            Rule::EOI => break,
+            _ => {}
+        }
+    }
+
+    Ok(Program { functions })
+}

crates/leanVm/src/parser/utils.rs

@@ -0,0 +1,7 @@
+pub(crate) fn remove_comments(input: &str) -> String {
+    input
+        .lines()
+        .map(|line| line.find("//").map_or(line, |pos| &line[..pos]))
+        .collect::<Vec<_>>()
+        .join("\n")
+}