|
|
|
@ -11,7 +11,7 @@ mod error;
@@ -11,7 +11,7 @@ mod error;
|
|
|
|
|
|
|
|
|
|
macro_rules! scale_message { |
|
|
|
|
($n:ident) => { |
|
|
|
|
Err(format!("<{}> is not a positive integer", $n)) |
|
|
|
|
Err(format!("<{}> is not a valid scale value", $n)) |
|
|
|
|
}; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -81,7 +81,7 @@ pomelo! {
@@ -81,7 +81,7 @@ pomelo! {
|
|
|
|
|
|
|
|
|
|
%type #[regex("s|x|y|z|r|ρ|θ|φ", read_var)] Var char; |
|
|
|
|
|
|
|
|
|
%type #[regex(r"@[^@ \t\f\n]+", |lex| String::from(lex.slice()))] Ident String; |
|
|
|
|
%type #[regex(r"@[\p{Letter}\p{Number}\p{Greek}]+", |lex| String::from(lex.slice()))] Ident String; |
|
|
|
|
|
|
|
|
|
%type #[token("set")] |
|
|
|
|
#[token("define")] |
|
|
|
@ -117,7 +117,7 @@ pomelo! {
@@ -117,7 +117,7 @@ pomelo! {
|
|
|
|
|
#[token("τ", |_| std::f64::consts::TAU)] |
|
|
|
|
#[regex("√2\\s", |_| std::f64::consts::SQRT_2)] |
|
|
|
|
#[regex("√(2)", |_| std::f64::consts::SQRT_2)] |
|
|
|
|
#[regex(r"[+-]?(?:\d*\.)?\d+", |lex| lex.slice().parse())] |
|
|
|
|
#[regex(r"(?:\d*\.)?\d+", |lex| lex.slice().parse())] |
|
|
|
|
Float f64; |
|
|
|
|
|
|
|
|
|
%type #[token("+")] Sum; |
|
|
|
@ -152,6 +152,7 @@ pomelo! {
@@ -152,6 +152,7 @@ pomelo! {
|
|
|
|
|
#[token("exp", |_| FunctionType::Exp)] |
|
|
|
|
#[token("ln", |_| FunctionType::Ln)] |
|
|
|
|
#[token("log", |_| FunctionType::Log)] |
|
|
|
|
#[token("neg", |_| FunctionType::Neg)] |
|
|
|
|
Function FunctionType; |
|
|
|
|
|
|
|
|
|
%type #[token("(")] LParen; |
|
|
|
@ -235,6 +236,7 @@ pomelo! {
@@ -235,6 +236,7 @@ pomelo! {
|
|
|
|
|
expr ::= expr(L) Power expr(R) { Expression::operation('^',L,R) } |
|
|
|
|
expr ::= Function(F) expr(A) { Expression::function(F,A) } |
|
|
|
|
expr ::= LParen expr(E) RParen { E } |
|
|
|
|
expr ::= Subtraction expr(E) { Expression::function(FunctionType::Neg,E) } |
|
|
|
|
expr ::= Var(V) { Expression::var(V) } |
|
|
|
|
expr ::= Float(F) { Expression::float(F) } |
|
|
|
|
expr ::= Ident(S) { Expression::ident(S) } |
|
|
|
@ -256,15 +258,10 @@ fn main() -> Result<(), error::Error> {
@@ -256,15 +258,10 @@ fn main() -> Result<(), error::Error> {
|
|
|
|
|
.multiple(false) |
|
|
|
|
.value_name("N") |
|
|
|
|
.validator(|n: String| -> Result<(), String> { |
|
|
|
|
match n.parse::<i32>() { |
|
|
|
|
Ok(x) => { |
|
|
|
|
if x > 0 { |
|
|
|
|
Ok(()) |
|
|
|
|
} else { |
|
|
|
|
if n.parse::<f64>().is_err() { |
|
|
|
|
scale_message!(n) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
Err(_) => scale_message!(n), |
|
|
|
|
} else { |
|
|
|
|
Ok(()) |
|
|
|
|
} |
|
|
|
|
}), |
|
|
|
|
) |
|
|
|
@ -276,6 +273,22 @@ fn main() -> Result<(), error::Error> {
@@ -276,6 +273,22 @@ fn main() -> Result<(), error::Error> {
|
|
|
|
|
.takes_value(false) |
|
|
|
|
.multiple(false), |
|
|
|
|
) |
|
|
|
|
.arg( |
|
|
|
|
Arg::with_name("debug") |
|
|
|
|
.short("d") |
|
|
|
|
.long("debug") |
|
|
|
|
.help("Show parsing steps") |
|
|
|
|
.takes_value(false) |
|
|
|
|
.multiple(false), |
|
|
|
|
) |
|
|
|
|
.arg( |
|
|
|
|
Arg::with_name("test") |
|
|
|
|
.short("t") |
|
|
|
|
.long("test") |
|
|
|
|
.help("Parses the input file, does not output") |
|
|
|
|
.takes_value(false) |
|
|
|
|
.multiple(false), |
|
|
|
|
) |
|
|
|
|
.arg( |
|
|
|
|
Arg::with_name("FILE") |
|
|
|
|
.help("The file describing the shape to map") |
|
|
|
@ -298,21 +311,37 @@ fn main() -> Result<(), error::Error> {
@@ -298,21 +311,37 @@ fn main() -> Result<(), error::Error> {
|
|
|
|
|
Ok(_) => Ok(()), |
|
|
|
|
Err(error) => Err(io_error(error, &path)), |
|
|
|
|
} |
|
|
|
|
}), |
|
|
|
|
}) |
|
|
|
|
.conflicts_with("test"), |
|
|
|
|
) |
|
|
|
|
.get_matches(); |
|
|
|
|
|
|
|
|
|
let scale = matches.value_of("scale").map(|s| s.parse::<i32>().unwrap()); |
|
|
|
|
let scale = matches.value_of("scale").map(|s| s.parse::<f64>().unwrap()); |
|
|
|
|
|
|
|
|
|
let mut object_description = fs::File::open(matches.value_of("FILE").unwrap()).unwrap(); |
|
|
|
|
|
|
|
|
|
let output_folder = matches.value_of("OUTPUT_DIR").unwrap(); |
|
|
|
|
|
|
|
|
|
let offset = matches.is_present("offset"); |
|
|
|
|
let debug = matches.is_present("debug"); |
|
|
|
|
let test = matches.is_present("test"); |
|
|
|
|
|
|
|
|
|
let output_folder = if test { |
|
|
|
|
"" |
|
|
|
|
} else { |
|
|
|
|
matches.value_of("OUTPUT_DIR").unwrap() |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
let mut data = String::new(); |
|
|
|
|
|
|
|
|
|
if object_description.read_to_string(&mut data).is_ok() { |
|
|
|
|
let read_count = object_description.read_to_string(&mut data)?; |
|
|
|
|
|
|
|
|
|
if debug { |
|
|
|
|
println!( |
|
|
|
|
"\nRead {} bytes, scale is {}", |
|
|
|
|
read_count, |
|
|
|
|
scale.unwrap_or(1.0_f64) |
|
|
|
|
); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
let lex = parser::Token::lexer(&data); |
|
|
|
|
|
|
|
|
|
let mut p = parser::Parser::new(); |
|
|
|
@ -320,7 +349,9 @@ fn main() -> Result<(), error::Error> {
@@ -320,7 +349,9 @@ fn main() -> Result<(), error::Error> {
|
|
|
|
|
let mut line_ends = false; |
|
|
|
|
|
|
|
|
|
for token in lex { |
|
|
|
|
//println!("{:?}", token);
|
|
|
|
|
if debug { |
|
|
|
|
println!("{:?}", token); |
|
|
|
|
} |
|
|
|
|
if token == parser::Token::LineEnd { |
|
|
|
|
if line_ends { |
|
|
|
|
continue; |
|
|
|
@ -337,8 +368,6 @@ fn main() -> Result<(), error::Error> {
@@ -337,8 +368,6 @@ fn main() -> Result<(), error::Error> {
|
|
|
|
|
|
|
|
|
|
let idents = assigns.unwrap_or_default(); |
|
|
|
|
let ident_arg = Some(&idents); |
|
|
|
|
//println!("\n{:?}", tree);
|
|
|
|
|
//println!("\nRead {} bytes, scale is {}", size, scale.unwrap_or(1));
|
|
|
|
|
let mut min_x: Option<i64> = None; |
|
|
|
|
let mut max_x: Option<i64> = None; |
|
|
|
|
let mut min_y: Option<i64> = None; |
|
|
|
@ -347,7 +376,7 @@ fn main() -> Result<(), error::Error> {
@@ -347,7 +376,7 @@ fn main() -> Result<(), error::Error> {
|
|
|
|
|
let mut max_z: Option<i64> = None; |
|
|
|
|
|
|
|
|
|
let mut vars = HashMap::new(); |
|
|
|
|
vars.insert('s', scale.unwrap_or(1) as f64); |
|
|
|
|
vars.insert('s', scale.unwrap_or(1_f64)); |
|
|
|
|
|
|
|
|
|
for limit in &limits { |
|
|
|
|
for dep in limit.min.var_dependencies(&ident_arg)? { |
|
|
|
@ -403,6 +432,14 @@ fn main() -> Result<(), error::Error> {
@@ -403,6 +432,14 @@ fn main() -> Result<(), error::Error> {
|
|
|
|
|
return Err(Error::UnboundedVar); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if debug { |
|
|
|
|
println!("\n{:?}", tree); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if test { |
|
|
|
|
return Ok(()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
let min_x: i64 = min_x.unwrap(); |
|
|
|
|
let max_x: i64 = max_x.unwrap(); |
|
|
|
|
let min_y: i64 = min_y.unwrap(); |
|
|
|
@ -438,10 +475,19 @@ fn main() -> Result<(), error::Error> {
@@ -438,10 +475,19 @@ fn main() -> Result<(), error::Error> {
|
|
|
|
|
let y_f: f64 = (y as f64) + if offset { 0.5_f64 } else { 0_f64 }; |
|
|
|
|
let z_f: f64 = (z as f64) + if offset { 0.5_f64 } else { 0_f64 }; |
|
|
|
|
let rho: f64 = (x_f.powi(2) + y_f.powi(2)).sqrt(); |
|
|
|
|
let phi: f64 = y_f.atan2(x_f); |
|
|
|
|
let r: f64 = (z_f.powi(2) + rho.powi(2)).sqrt(); |
|
|
|
|
let tht: f64 = (z_f / rho).atan(); |
|
|
|
|
|
|
|
|
|
let phi: f64; |
|
|
|
|
|
|
|
|
|
if rho < 2_f64 * f64::EPSILON { |
|
|
|
|
phi = f64::NAN; |
|
|
|
|
} else if y_f >= 0_f64 { |
|
|
|
|
phi = (x_f / rho).acos(); |
|
|
|
|
} else { |
|
|
|
|
phi = -((x_f / rho).acos()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
vars.insert('x', x_f); |
|
|
|
|
vars.insert('y', y_f); |
|
|
|
|
vars.insert('z', z_f); |
|
|
|
@ -476,7 +522,6 @@ fn main() -> Result<(), error::Error> {
@@ -476,7 +522,6 @@ fn main() -> Result<(), error::Error> {
|
|
|
|
|
} |
|
|
|
|
lodepng::encode32_file(name, &pixels, pix_width, pix_height)?; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
Ok(()) |
|
|
|
|
|
|
|
|
|