minor cleanup

kscalelabs · Oct 30, 2024 · ff07e3e · ff07e3e
1 parent f8fff97
commit ff07e3e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 17 deletions.
diff --git a/klang/src/parser/expressions.rs b/klang/src/parser/expressions.rs
@@ -1,9 +1,8 @@
 use super::ast::*;
 use super::literals::parse_literal;
 use super::parser::Rule;
-use pest::iterators::Pair;
 
-pub fn parse_expression(pair: pest::iterators::Pair<Rule>) -> Expression {
+pub(crate) fn parse_expression(pair: pest::iterators::Pair<Rule>) -> Expression {
     match pair.as_rule() {
         Rule::expression => parse_expression(pair.into_inner().next().unwrap()),
         Rule::conditional => parse_conditional(pair),

diff --git a/klang/src/parser/functions.rs b/klang/src/parser/functions.rs
@@ -2,7 +2,7 @@ use super::ast::*;
 use super::parser::Rule;
 use pest::iterators::Pair;
 
-pub fn parse_function_def(function_def: Pair<Rule>) -> FunctionDef {
+pub(crate) fn parse_function_def(function_def: Pair<Rule>) -> FunctionDef {
     let mut name = String::new();
     let mut parameters = Vec::new();
     let mut doc_string = String::new();
@@ -26,7 +26,7 @@ pub fn parse_function_def(function_def: Pair<Rule>) -> FunctionDef {
     }
 }
 
-pub fn parse_parameters(parameters: Pair<Rule>) -> Vec<Parameter> {
+fn parse_parameters(parameters: Pair<Rule>) -> Vec<Parameter> {
     let mut result = Vec::new();
 
     for part in parameters.into_inner() {
@@ -41,7 +41,7 @@ pub fn parse_parameters(parameters: Pair<Rule>) -> Vec<Parameter> {
     result
 }
 
-pub fn parse_parameter_value(parameter_value: Pair<Rule>) -> Parameter {
+fn parse_parameter_value(parameter_value: Pair<Rule>) -> Parameter {
     let mut identifier = String::new();
     let mut param_type = String::new();
 
@@ -59,12 +59,12 @@ pub fn parse_parameter_value(parameter_value: Pair<Rule>) -> Parameter {
     }
 }
 
-pub fn parse_doc_string(pair: Pair<Rule>) -> String {
+fn parse_doc_string(pair: Pair<Rule>) -> String {
     let inner = pair.into_inner().next().unwrap();
     inner.as_str()[1..inner.as_str().len() - 1].to_string()
 }
 
-pub fn parse_block(pair: Pair<Rule>) -> Block {
+fn parse_block(pair: Pair<Rule>) -> Block {
     let statements = pair
         .into_inner()
         .filter_map(|p| {
@@ -79,7 +79,7 @@ pub fn parse_block(pair: Pair<Rule>) -> Block {
     Block { statements }
 }
 
-pub fn parse_statement(pair: Pair<Rule>) -> Statement {
+fn parse_statement(pair: Pair<Rule>) -> Statement {
     let inner = pair.into_inner().next().unwrap();
     match inner.as_rule() {
         Rule::assignment_stmt => parse_assignment_statement(inner),

diff --git a/klang/src/parser/literals.rs b/klang/src/parser/literals.rs
@@ -1,6 +1,5 @@
 use super::ast::*;
 use super::parser::Rule;
-use pest::iterators::Pair;
 
 pub(crate) fn parse_literal(pair: pest::iterators::Pair<Rule>) -> Expression {
     let inner_pair = pair.into_inner().next().unwrap();

diff --git a/klang/src/parser/mod.rs b/klang/src/parser/mod.rs
@@ -10,11 +10,8 @@ pub mod literals;
 pub mod parser;
 pub mod statements;
 
-use expressions::*;
-use functions::*;
-use literals::*;
-use parser::*;
-use statements::*;
+use functions::parse_function_def;
+use parser::Rule;
 
 pub fn parse_program(pair: pest::iterators::Pair<Rule>) -> Program {
     let mut functions = Vec::new();

diff --git a/klang/src/parser/statements.rs b/klang/src/parser/statements.rs
@@ -57,7 +57,7 @@ pub fn parse_block(block: Pair<Rule>) -> Block {
     Block { statements }
 }
 
-pub fn parse_assignment_stmt(assignment_stmt: Pair<Rule>) -> AssignmentStmt {
+fn parse_assignment_stmt(assignment_stmt: Pair<Rule>) -> AssignmentStmt {
     let mut identifier = String::new();
     let mut operator = String::new();
     let mut expression = None;
@@ -80,7 +80,7 @@ pub fn parse_assignment_stmt(assignment_stmt: Pair<Rule>) -> AssignmentStmt {
     }
 }
 
-pub fn parse_loop_stmt(loop_stmt: Pair<Rule>) -> LoopStmt {
+fn parse_loop_stmt(loop_stmt: Pair<Rule>) -> LoopStmt {
     let mut body = None;
 
     for part in loop_stmt.into_inner() {
@@ -95,7 +95,7 @@ pub fn parse_loop_stmt(loop_stmt: Pair<Rule>) -> LoopStmt {
     LoopStmt { body }
 }
 
-pub fn parse_return_stmt(return_stmt: Pair<Rule>) -> ReturnStmt {
+fn parse_return_stmt(return_stmt: Pair<Rule>) -> ReturnStmt {
     let mut expression = None;
 
     for part in return_stmt.into_inner() {