From bf4632c461508de5202db98d25cd7ec06787c8dd Mon Sep 17 00:00:00 2001 From: Joel Kronqvist Date: Sat, 26 Jul 2025 10:52:03 +0300 Subject: Created necessary data structures and utilities for integers and their operations; added tests for them --- src/lib.rs | 1 + src/sexp/mod.rs | 27 +++++++++++++++++++++++++++ src/sexp/step.rs | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ src/sexp/util.rs | 27 +++++++++++++++++++++++++++ 4 files changed, 104 insertions(+) create mode 100644 src/lib.rs create mode 100644 src/sexp/mod.rs create mode 100644 src/sexp/step.rs create mode 100644 src/sexp/util.rs (limited to 'src') diff --git a/src/lib.rs b/src/lib.rs new file mode 100644 index 0000000..42cc883 --- /dev/null +++ b/src/lib.rs @@ -0,0 +1 @@ +pub mod sexp; diff --git a/src/sexp/mod.rs b/src/sexp/mod.rs new file mode 100644 index 0000000..c920e41 --- /dev/null +++ b/src/sexp/mod.rs @@ -0,0 +1,27 @@ + +pub mod step; +pub mod util; + +/// A leaf node for S-Expressions. +/// +/// May represent built-in operators, +/// variables (to be added), functions +/// (to be added) or values. +#[derive(Debug)] +#[derive(PartialEq)] +pub enum SLeaf { + Add, + Sub, + Mul, + Div, + Int(i32), +} + +/// An S-Expression; the defining structure of the language. +#[derive(Debug)] +#[derive(PartialEq)] +pub enum SExp { + SCons(Box, Box), + Atom(SLeaf), +} + diff --git a/src/sexp/step.rs b/src/sexp/step.rs new file mode 100644 index 0000000..86ad9ea --- /dev/null +++ b/src/sexp/step.rs @@ -0,0 +1,49 @@ + +use crate::sexp::SExp; + +impl SExp { + + /// Evaluates the s-expression one step. + /// + /// **Integer operations** + /// + /// Addition, subtraction, multiplication and division + /// are supported. + /// ```rust + /// use melisp::sexp::{SExp::*, SLeaf::*, util::*}; + /// + /// assert_eq!( + /// sexp(Add, sexp(1, 1)).step().unwrap(), + /// Atom(Int(2)) + /// ); + /// + /// assert_eq!( + /// sexp(Sub, sexp(1, 2).step().unwrap()), + /// Atom(Int(-1)) + /// ); + /// + /// assert_eq!( + /// sexp(Mul, sexp(2, 3).step().unwrap()), + /// Atom(Int(6)) + /// ); + /// + /// assert_eq!( + /// sexp(Div, sexp(6, 2).step().unwrap()), + /// Atom(Int(3)) + /// ); + /// ``` + /// + /// Division truncates the decimals. + /// ```rust + /// use melisp::sexp::{SExp::*, SLeaf::*, util::*}; + /// + /// assert_eq!( + /// sexp(Div, sexp(5, 2).step().unwrap()), + /// Atom(Int(2)) + /// ); + /// + /// ``` + pub fn step(self) -> Result { + todo!(); + } +} diff --git a/src/sexp/util.rs b/src/sexp/util.rs new file mode 100644 index 0000000..a4e3ab4 --- /dev/null +++ b/src/sexp/util.rs @@ -0,0 +1,27 @@ + +use crate::sexp::SExp; +use crate::sexp::SLeaf; +use crate::sexp::SExp::*; +use crate::sexp::SLeaf::*; + +impl From for Box { + fn from(int: i32) -> Self { + Box::new(Atom(Int(int))) + } +} + +impl From for Box { + fn from(leaf: SLeaf) -> Self { + Box::new(Atom(leaf)) + } +} + +impl From for SLeaf { + fn from(int: i32) -> Self { + Int(int) + } +} + +pub fn sexp(x: impl Into>, y: impl Into>) -> SExp { + SCons(x.into(), y.into()) +} -- cgit v1.2.3