Rename compiler to transpiler and implement load and tick annotation for main function

This commit is contained in:
Moritz Hölting 2024-04-03 01:27:02 +02:00
parent ced609265c
commit 9159c8222e
6 changed files with 51 additions and 28 deletions

View File

@ -11,7 +11,7 @@ pub enum Error {
#[error("An error occurred while parsing the source code.")] #[error("An error occurred while parsing the source code.")]
ParseError(#[from] crate::syntax::error::Error), ParseError(#[from] crate::syntax::error::Error),
#[error("An error occurred while compiling the source code.")] #[error("An error occurred while compiling the source code.")]
CompileError(#[from] crate::compile::error::CompileError), CompileError(#[from] crate::transpile::error::TranspileError),
#[error("An error occurred")] #[error("An error occurred")]
Other(&'static str), Other(&'static str),
} }

View File

@ -1,4 +0,0 @@
//! The compile module is responsible for compiling the abstract syntax tree into a data pack.
pub mod compiler;
pub mod error;

View File

@ -13,15 +13,15 @@
#![allow(clippy::missing_panics_doc, clippy::missing_const_for_fn)] #![allow(clippy::missing_panics_doc, clippy::missing_const_for_fn)]
pub mod base; pub mod base;
pub mod compile;
pub mod lexical; pub mod lexical;
pub mod syntax; pub mod syntax;
pub mod transpile;
use std::{cell::Cell, fmt::Display, path::Path}; use std::{cell::Cell, fmt::Display, path::Path};
use base::{source_file::SourceFile, Handler, Result}; use base::{source_file::SourceFile, Handler, Result};
use compile::compiler::Compiler;
use syntax::syntax_tree::program::Program; use syntax::syntax_tree::program::Program;
use transpile::transpiler::Transpiler;
#[cfg(feature = "shulkerbox")] #[cfg(feature = "shulkerbox")]
use shulkerbox::{datapack::Datapack, util::compile::CompileOptions, virtual_fs::VFolder}; use shulkerbox::{datapack::Datapack, util::compile::CompileOptions, virtual_fs::VFolder};
@ -103,8 +103,8 @@ pub fn transpile(path: &Path) -> Result<Datapack> {
)); ));
} }
let mut compiler = Compiler::new(); let mut transpiler = Transpiler::new();
let datapack = compiler.compile(&program, &printer)?; let datapack = transpiler.transpile(&program, &printer)?;
Ok(datapack) Ok(datapack)
} }
@ -144,8 +144,8 @@ pub fn compile(path: &Path) -> Result<VFolder> {
// println!("program: {program:#?}"); // println!("program: {program:#?}");
let mut compiler = Compiler::new(); let mut transpiler = Transpiler::new();
let datapack = compiler.compile(&program, &printer)?; let datapack = transpiler.transpile(&program, &printer)?;
// println!("datapack: {datapack:#?}"); // println!("datapack: {datapack:#?}");

View File

@ -3,7 +3,7 @@
/// Errors that can occur during compilation. /// Errors that can occur during compilation.
#[allow(clippy::module_name_repetitions, missing_docs)] #[allow(clippy::module_name_repetitions, missing_docs)]
#[derive(Debug, thiserror::Error, Clone, Copy)] #[derive(Debug, thiserror::Error, Clone, Copy)]
pub enum CompileError { pub enum TranspileError {
#[error("No main function was found in the source code.")] #[error("No main function was found in the source code.")]
MissingMainFunction, MissingMainFunction,
} }

4
src/transpile/mod.rs Normal file
View File

@ -0,0 +1,4 @@
//! The transpile module is responsible for transpiling the abstract syntax tree into a data pack.
pub mod error;
pub mod transpiler;

View File

@ -9,15 +9,16 @@ use crate::{
syntax::syntax_tree::{declaration::Declaration, program::Program, statement::Statement}, syntax::syntax_tree::{declaration::Declaration, program::Program, statement::Statement},
}; };
use super::error::{self, CompileError}; use super::error::{self, TranspileError};
/// A compiler for `ShulkerScript`. /// A transpiler for `ShulkerScript`.
#[derive(Debug, Clone, Default)] #[derive(Debug, Clone, Default)]
pub struct Compiler { pub struct Transpiler {
functions: HashMap<String, Vec<Statement>>, functions: HashMap<String, (Vec<Statement>, AnnotationMap)>,
} }
type AnnotationMap = HashMap<String, Option<String>>;
impl Compiler { impl Transpiler {
/// Creates a new compiler. /// Creates a new compiler.
#[must_use] #[must_use]
pub fn new() -> Self { pub fn new() -> Self {
@ -29,24 +30,39 @@ impl Compiler {
/// Compiles the given program. /// Compiles the given program.
/// ///
/// # Errors /// # Errors
/// - [`CompileError::MissingMainFunction`] If the main function is missing. /// - [`TranspileError::MissingMainFunction`] If the main function is missing.
pub fn compile( pub fn transpile(
&mut self, &mut self,
program: &Program, program: &Program,
handler: &impl Handler<error::CompileError>, handler: &impl Handler<error::TranspileError>,
) -> Result<Datapack, CompileError> { ) -> Result<Datapack, TranspileError> {
for declaration in program.declarations() { for declaration in program.declarations() {
match declaration { match declaration {
Declaration::Function(function) => self.functions.insert( Declaration::Function(function) => {
function.identifier().span().str().to_string(), let name = function.identifier().span().str().to_string();
function.block().statements().clone(), let statements = function.block().statements().clone();
), let annotations = function
.annotations()
.iter()
.map(|annotation| {
let key = annotation.identifier();
let value = annotation.value();
(
key.span().str().to_string(),
value
.as_ref()
.map(|(_, ref v)| v.string_content().to_string()),
)
})
.collect();
self.functions.insert(name, (statements, annotations))
}
}; };
} }
let Some(main_function) = self.functions.get("main") else { let Some((main_function, main_annotations)) = self.functions.get("main") else {
handler.receive(CompileError::MissingMainFunction); handler.receive(TranspileError::MissingMainFunction);
return Err(CompileError::MissingMainFunction); return Err(TranspileError::MissingMainFunction);
}; };
let main_commands = compile_function(main_function); let main_commands = compile_function(main_function);
@ -56,6 +72,13 @@ impl Compiler {
let main_function = namespace.function_mut("main"); let main_function = namespace.function_mut("main");
main_function.get_commands_mut().extend(main_commands); main_function.get_commands_mut().extend(main_commands);
if main_annotations.contains_key("tick") {
datapack.add_tick("shulkerscript:main");
}
if main_annotations.contains_key("load") {
datapack.add_load("shulkerscript:main");
}
Ok(datapack) Ok(datapack)
} }
} }