Skip to content

BigInt support and refactors #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 27, 2021
Merged

BigInt support and refactors #5

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3349072
BigInt support, Configurable Int and Float, and refactors
Nov 17, 2021
0c55044
🦀
alexmozaidze Nov 25, 2021
d9cc3c6
Made `range` exclusive, and refactored if statement to use pattern ma…
alexmozaidze Nov 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,19 @@ doc = true
[[bin]]
name = "rust_lisp"
path = "src/main.rs"

[features]
# What integer to use for Value::Int
bigint = ["num-bigint", "num-traits"]
i128 = []
i64 = []
i16 = []
i8 = []

# Use f64 for Value::Float, if unset, use f32
f64 = []

[dependencies]
cfg-if = "1.0"
num-traits = { version = "0.2", optional = true }
num-bigint = { version = "0.4", optional = true }
167 changes: 97 additions & 70 deletions src/default_environment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ use crate::{
utils::{require_int_parameter, require_list_parameter, require_parameter},
};
use std::collections::HashMap;
use cfg_if::cfg_if;
cfg_if! {
if #[cfg(feature = "bigint")] {
use num_traits::ToPrimitive;
} else {
use crate::model::IntType;
}
}

/// Initialize an instance of `Env` with several core Lisp functions implemented
/// in Rust. **Without this, you will only have access to the functions you
Expand All @@ -18,7 +26,7 @@ pub fn default_env() -> Env {
let expr = require_parameter("print", args, 0)?;

println!("{}", &expr);
return Ok(expr.clone());
Ok(expr.clone())
}),
);

Expand Down Expand Up @@ -99,7 +107,7 @@ pub fn default_env() -> Env {
Value::NativeFunc(|_env, args| {
let list = require_list_parameter("car", args, 0)?;

return list.car().map(|c| c.clone());
list.car()
}),
);

Expand All @@ -108,7 +116,7 @@ pub fn default_env() -> Env {
Value::NativeFunc(|_env, args| {
let list = require_list_parameter("cdr", args, 0)?;

return Ok(Value::List(list.cdr()));
Ok(Value::List(list.cdr()))
}),
);

Expand All @@ -118,26 +126,33 @@ pub fn default_env() -> Env {
let car = require_parameter("cons", args, 0)?;
let cdr = require_list_parameter("cons", args, 1)?;

return Ok(Value::List(cdr.cons(car.clone())));
Ok(Value::List(cdr.cons(car.clone())))
}),
);

entries.insert(
String::from("list"),
Value::NativeFunc(|_env, args| Ok(Value::List(args.into_iter().collect::<List>()))),
Value::NativeFunc(|_env, args| Ok(Value::List(args.iter().collect::<List>()))),
);

entries.insert(
String::from("nth"),
Value::NativeFunc(|_env, args| {
let index = require_int_parameter("nth", args, 0)?;
cfg_if! {
if #[cfg(feature = "bigint")] {
let index = require_int_parameter("nth", args, 0)?
.to_usize()
.ok_or(RuntimeError::new("Failed converting `BigInt` to `usize`"))?;
} else {
let index = require_int_parameter("nth", args, 0)? as usize;
}
}
let list = require_list_parameter("nth", args, 1)?;

return Ok(list
Ok(list
.into_iter()
.nth(index as usize)
.map(|v| v.clone())
.unwrap_or(Value::NIL));
.nth(index)
.unwrap_or(Value::NIL))
}),
);

Expand All @@ -150,7 +165,7 @@ pub fn default_env() -> Env {

v.sort();

return Ok(Value::List(v.into_iter().collect()));
Ok(Value::List(v.into_iter().collect()))
}),
);

Expand All @@ -163,7 +178,7 @@ pub fn default_env() -> Env {

v.reverse();

return Ok(Value::List(v.into_iter().collect()));
Ok(Value::List(v.into_iter().collect()))
}),
);

Expand All @@ -173,18 +188,19 @@ pub fn default_env() -> Env {
let func = require_parameter("map", args, 0)?;
let list = require_list_parameter("map", args, 1)?;

return list
list
.into_iter()
.map(|val| {
let expr = lisp! { ({func.clone()} {val.clone()}) };
let expr = lisp! { ({func.clone()} {val}) };

eval(env.clone(), &expr)
})
.collect::<Result<List, RuntimeError>>()
.map(|l| Value::List(l));
.map(Value::List)
}),
);

// 🦀 Oh the poor `filter`, you must feel really sad being unused.
// entries.insert(
// String::from("filter"),
// Value::NativeFunc(
Expand All @@ -208,7 +224,13 @@ pub fn default_env() -> Env {
Value::NativeFunc(|_env, args| {
let list = require_list_parameter("length", args, 0)?;

return Ok(Value::Int(list.into_iter().len() as i32));
cfg_if! {
if #[cfg(feature = "bigint")] {
Ok(Value::Int(list.into_iter().len().into()))
} else {
Ok(Value::Int(list.into_iter().len() as IntType))
}
}
}),
);

Expand All @@ -218,9 +240,24 @@ pub fn default_env() -> Env {
let start = require_int_parameter("range", args, 0)?;
let end = require_int_parameter("range", args, 1)?;

Ok(Value::List(
(start..end).map(|i| Value::Int(i)).collect::<List>(),
))
cfg_if! {
if #[cfg(feature = "bigint")] {
let mut i = start.clone();
let mut res = Vec::with_capacity((end.clone() - start)
.to_usize()
.ok_or(RuntimeError::new("Failed converting `BigInt` to `usize`"))?
);

while i <= end {
res.push(i.clone());
i += 1;
}

Ok(Value::List(res.into_iter().map(Value::Int).collect::<List>()))
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's weird that BigInt doesn't seem to implement Step. Still, I can't help but feel there might be a simpler way to do this? If not, this is probably fine

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah hmm, that's disappointing
rust-num/num-bigint#68

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I asked about it in Rust discord server, they gave me the same answer

} else {
Ok(Value::List((start..=end).map(Value::Int).collect::<List>()))
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh wow, was this logic broken before? (start..end vs start..=end)

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually- I think the exclusive behavior was intended, since this is how ranges tend to work in other languages:

(range 0 10)
'(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)

So let's remove the = here, and also change the <= to < in the BigInt version

}
}
}),
);

Expand All @@ -230,24 +267,21 @@ pub fn default_env() -> Env {
let a = require_parameter("+", args, 0)?;
let b = require_parameter("+", args, 1)?;

match (a.as_int(), b.as_int()) {
(Some(a), Some(b)) => return Ok(Value::Int(a + b)),
_ => (),
};
if let (Some(a), Some(b)) = (a.as_int(), b.as_int()) {
return Ok(Value::Int(a + b))
}

match (a.as_float(), b.as_float()) {
(Some(a), Some(b)) => return Ok(Value::Float(a + b)),
_ => (),
};
if let (Some(a), Some(b)) = (a.as_float(), b.as_float()) {
return Ok(Value::Float(a + b))
}

match (a.as_string(), b.as_string()) {
(Some(a), Some(b)) => return Ok(Value::String(String::from(a) + b)),
_ => (),
};
if let (Some(a), Some(b)) = (a.as_string(), b.as_string()) {
return Ok(Value::String(String::from(a) + b))
}

return Err(RuntimeError {
Err(RuntimeError {
msg: String::from("Function \"+\" requires arguments to be numbers or strings"),
});
})
}),
);

Expand All @@ -257,19 +291,17 @@ pub fn default_env() -> Env {
let a = require_parameter("-", args, 0)?;
let b = require_parameter("-", args, 1)?;

match (a.as_int(), b.as_int()) {
(Some(a), Some(b)) => return Ok(Value::Int(a - b)),
_ => (),
};
if let (Some(a), Some(b)) = (a.as_int(), b.as_int()) {
return Ok(Value::Int(a - b))
}

match (a.as_float(), b.as_float()) {
(Some(a), Some(b)) => return Ok(Value::Float(a - b)),
_ => (),
};
if let (Some(a), Some(b)) = (a.as_float(), b.as_float()) {
return Ok(Value::Float(a - b))
}

return Err(RuntimeError {
Err(RuntimeError {
msg: String::from("Function \"-\" requires arguments to be numbers"),
});
})
}),
);

Expand All @@ -279,19 +311,17 @@ pub fn default_env() -> Env {
let a = require_parameter("*", args, 0)?;
let b = require_parameter("*", args, 1)?;

match (a.as_int(), b.as_int()) {
(Some(a), Some(b)) => return Ok(Value::Int(a * b)),
_ => (),
};
if let (Some(a), Some(b)) = (a.as_int(), b.as_int()) {
return Ok(Value::Int(a * b))
}

match (a.as_float(), b.as_float()) {
(Some(a), Some(b)) => return Ok(Value::Float(a * b)),
_ => (),
};
if let (Some(a), Some(b)) = (a.as_float(), b.as_float()) {
return Ok(Value::Float(a * b))
}

return Err(RuntimeError {
Err(RuntimeError {
msg: String::from("Function \"*\" requires arguments to be numbers"),
});
})
}),
);

Expand All @@ -301,19 +331,17 @@ pub fn default_env() -> Env {
let a = require_parameter("/", args, 0)?;
let b = require_parameter("/", args, 1)?;

match (a.as_int(), b.as_int()) {
(Some(a), Some(b)) => return Ok(Value::Int(a / b)),
_ => (),
};
if let (Some(a), Some(b)) = (a.as_int(), b.as_int()) {
return Ok(Value::Int(a / b))
}

match (a.as_float(), b.as_float()) {
(Some(a), Some(b)) => return Ok(Value::Float(a / b)),
_ => (),
};
if let (Some(a), Some(b)) = (a.as_float(), b.as_float()) {
return Ok(Value::Float(a / b))
}

return Err(RuntimeError {
Err(RuntimeError {
msg: String::from("Function \"/\" requires arguments to be numbers"),
});
})
}),
);

Expand All @@ -323,14 +351,13 @@ pub fn default_env() -> Env {
let a = require_parameter("truncate", args, 0)?;
let b = require_parameter("truncate", args, 1)?;

match (a.as_int(), b.as_int()) {
(Some(a), Some(b)) => return Ok(Value::Int(a / b)),
_ => (),
};
if let (Some(a), Some(b)) = (a.as_int(), b.as_int()) {
return Ok(Value::Int(a / b))
}

return Err(RuntimeError {
Err(RuntimeError {
msg: String::from("Function \"truncate\" requires arguments to be integers"),
});
})
}),
);

Expand Down Expand Up @@ -418,7 +445,7 @@ pub fn default_env() -> Env {
let func = require_parameter("apply", args, 0)?;
let params = require_list_parameter("apply", args, 1)?;

eval(env.clone(), &Value::List(params.cons(func.clone())))
eval(env, &Value::List(params.cons(func.clone())))
}),
);

Expand Down
Loading