Skip to content

Commit 1169d3a

Browse files
author
mendelsshop
committed
cargo formatted: added endlines to some ast elements
1 parent 91a1c35 commit 1169d3a

File tree

6 files changed

+106
-66
lines changed

6 files changed

+106
-66
lines changed

‎src/cli.rs‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,13 @@ pub fn get_dash_args(args: &[String], start_index: usize, args_struct: &mut Pars
8080
};
8181
unsafe { TOGGLE_CASE = num as i32 };
8282
} else if char_part_arg == 't' {
83-
let number: i32 = arg.split_once('=').map_or_else(|| error::error(0, "option t requires an =number"), |n| match n.1.parse() {
84-
Ok(value) => value,
85-
Err(error) => error::error(0, error),
86-
});
83+
let number: i32 = arg.split_once('=').map_or_else(
84+
|| error::error(0, "option t requires an =number"),
85+
|n| match n.1.parse() {
86+
Ok(value) => value,
87+
Err(error) => error::error(0, error),
88+
},
89+
);
8790
unsafe {
8891
TOGGLE_CASE = number;
8992
}

‎src/error.rs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ pub fn arg_error<T: Display>(
3434
);
3535
}
3636
} else if num_args != given_args {
37-
error(
38-
line,
39-
format!("{function} requires {num_args} arguments"),
40-
);
37+
error(line, format!("{function} requires {num_args} arguments"));
4138
}
4239
}

‎src/eval.rs‎

Lines changed: 57 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -255,14 +255,17 @@ impl Scope {
255255
self.vars
256256
.insert(new_name.to_string(), NewIdentifierType::List(new_var));
257257
} else {
258-
self.parent_scope.as_mut().map_or_else(|| error(line, "variable not found"), |parent| {
259-
parent.set_var(
260-
name,
261-
&mut new_val.to_vec_literaltype(line),
262-
recurse,
263-
line,
264-
);
265-
});
258+
self.parent_scope.as_mut().map_or_else(
259+
|| error(line, "variable not found"),
260+
|parent| {
261+
parent.set_var(
262+
name,
263+
&mut new_val.to_vec_literaltype(line),
264+
recurse,
265+
line,
266+
);
267+
},
268+
);
266269
}
267270
} else {
268271
let mut new_var: Box<NewList> = match self.get_var(new_name, line) {
@@ -289,7 +292,10 @@ impl Scope {
289292
if self.has_var(name, false) {
290293
self.vars.insert(name.to_string(), new_val);
291294
} else {
292-
self.parent_scope.as_mut().map_or_else(|| error(line, "variable not found"), |parent| parent.set_var(name, value, recurse, line));
295+
self.parent_scope.as_mut().map_or_else(
296+
|| error(line, "variable not found"),
297+
|parent| parent.set_var(name, value, recurse, line),
298+
);
293299
}
294300
} else {
295301
self.vars.insert(name.to_string(), new_val);
@@ -335,7 +341,10 @@ impl Scope {
335341
NewIdentifierType::Vairable(_) => v.clone(),
336342
NewIdentifierType::List(list) => NewIdentifierType::List(list.clone()),
337343
},
338-
None => self.parent_scope.as_mut().map_or_else(|| error(line, format!("variable not found {name}")), |parent| parent.get_var(name, line)),
344+
None => self.parent_scope.as_mut().map_or_else(
345+
|| error(line, format!("variable not found {name}")),
346+
|parent| parent.get_var(name, line),
347+
),
339348
}
340349
}
341350
pub fn set_function(&mut self, name: char, args: Vec<Thing>, body: f64) {
@@ -344,7 +353,10 @@ impl Scope {
344353
pub fn get_function(&self, name: char) -> Option<(Vec<Thing>, f64)> {
345354
match self.function.get(&name) {
346355
Some((args, body)) => Some((args.clone(), *body)),
347-
None => self.parent_scope.as_ref().and_then(|parent| parent.get_function(name))
356+
None => self
357+
.parent_scope
358+
.as_ref()
359+
.and_then(|parent| parent.get_function(name)),
348360
}
349361
}
350362
pub fn delete_var(&mut self, name: &str) -> Option<NewIdentifierType> {
@@ -362,11 +374,16 @@ impl Scope {
362374
if self.vars.contains_key(name) {
363375
true
364376
} else {
365-
self.parent_scope.as_ref().map_or(false, |parent| parent.has_var(name, recurse))
377+
self.parent_scope
378+
.as_ref()
379+
.map_or(false, |parent| parent.has_var(name, recurse))
366380
}
367381
}
368382
pub fn drop_scope(&mut self) {
369-
let p_scope: Self = self.parent_scope.take().map_or_else(|| error(0, "no parent scope"), |scope| *scope);
383+
let p_scope: Self = self
384+
.parent_scope
385+
.take()
386+
.map_or_else(|| error(0, "no parent scope"), |scope| *scope);
370387
*self = p_scope;
371388
}
372389

@@ -461,14 +478,26 @@ impl Eval {
461478
}
462479
}
463480
IdentifierType::List(ref list) => {
464-
let car: LiteralOrFile = self.find_pointer_in_other_stuff(&list.car).map_or_else(|| LiteralOrFile::Literal(LiteralType::from_other_stuff(
465-
&list.car,
466-
variable.line,
467-
)), |pointer| pointer);
468-
let cdr: LiteralOrFile = self.find_pointer_in_other_stuff(&list.cdr).map_or_else(|| LiteralOrFile::Literal(LiteralType::from_other_stuff(
469-
&list.cdr,
470-
variable.line,
471-
)), |pointer| pointer);
481+
let car: LiteralOrFile =
482+
self.find_pointer_in_other_stuff(&list.car).map_or_else(
483+
|| {
484+
LiteralOrFile::Literal(LiteralType::from_other_stuff(
485+
&list.car,
486+
variable.line,
487+
))
488+
},
489+
|pointer| pointer,
490+
);
491+
let cdr: LiteralOrFile =
492+
self.find_pointer_in_other_stuff(&list.cdr).map_or_else(
493+
|| {
494+
LiteralOrFile::Literal(LiteralType::from_other_stuff(
495+
&list.cdr,
496+
variable.line,
497+
))
498+
},
499+
|pointer| pointer,
500+
);
472501
self.scope.set_var(
473502
&variable.name,
474503
&mut vec![car, cdr],
@@ -478,7 +507,13 @@ impl Eval {
478507
}
479508
},
480509
Thing::Return(os, line) => {
481-
let ret: LiteralOrFile = os.map_or(LiteralOrFile::Literal(LiteralType::Hempty), |os| self.find_pointer_in_other_stuff(&os).map_or_else(|| LiteralOrFile::Literal(LiteralType::from_other_stuff(&os, line)), |identifier| identifier));
510+
let ret: LiteralOrFile =
511+
os.map_or(LiteralOrFile::Literal(LiteralType::Hempty), |os| {
512+
self.find_pointer_in_other_stuff(&os).map_or_else(
513+
|| LiteralOrFile::Literal(LiteralType::from_other_stuff(&os, line)),
514+
|identifier| identifier,
515+
)
516+
});
482517
return Some(Stopper::Return(ret));
483518
}
484519
Thing::Expression(expr) => {

‎src/main.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ fn main() {
1616
cli::get_dash_args(&args, index, &mut parsed_args);
1717
}
1818
if parsed_args.log {
19-
simple_file_logger::init_logger!("UMPL", simple_file_logger::LogLevel::Debug).expect("couldn't initialize logger");
19+
simple_file_logger::init_logger!("UMPL", simple_file_logger::LogLevel::Debug)
20+
.expect("couldn't initialize logger");
2021
}
2122
let mut full_repl: Vec<String> = Vec::new(); // create a vector to hold the lines of the repl just in case we need to write it to a file
2223
if parsed_args.repl {

‎src/parser/mod.rs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,9 @@ impl Parser {
196196
!= TokenType::CodeBlockEnd
197197
{
198198
self.in_function = true; // for funtions inside functions see loop below for more info
199-
if let Some(t) = self.parse_from_token() { function.push(t) }
199+
if let Some(t) = self.parse_from_token() {
200+
function.push(t)
201+
}
200202
}
201203
self.advance("parse_from_token after function body looking for function end");
202204
self.in_function = false;
@@ -725,7 +727,9 @@ impl Display for Thing {
725727
Self::Return(stuff, _) => write!(
726728
f,
727729
"Return{}",
728-
stuff.as_ref().map_or_else(String::new, |stuff| format!("({stuff})")),
730+
stuff
731+
.as_ref()
732+
.map_or_else(String::new, |stuff| format!("({stuff})")),
729733
),
730734
}
731735
}
@@ -744,7 +748,9 @@ impl fmt::Debug for Thing {
744748
Self::Return(stuff, line) => write!(
745749
f,
746750
"[Return{} at line: {}]",
747-
stuff.as_ref().map_or_else(String::new, |stuff| format!("({stuff:?})")),
751+
stuff
752+
.as_ref()
753+
.map_or_else(String::new, |stuff| format!("({stuff:?})")),
748754
line
749755
),
750756
}

‎src/token.rs‎

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,18 @@ impl TokenType {
235235
}
236236
strings => format!("0x{}", strings.trim()),
237237
};
238-
let number: FloatLiteral = string.parse().map_or_else(|_| error::error(
239-
line,
240-
format!("Error parsing string {} to number", string.trim()),
241-
), |value: FloatLiteral| value);
238+
let number: FloatLiteral = string.parse().map_or_else(
239+
|_| {
240+
error::error(
241+
line,
242+
format!(
243+
"Error parsing string {} to number",
244+
string.trim()
245+
),
246+
)
247+
},
248+
|value: FloatLiteral| value,
249+
);
242250
LiteralType::Number(number.convert::<f64>().inner())
243251
}
244252
Self::RunCommand => {
@@ -273,10 +281,7 @@ let number: FloatLiteral = string.parse().map_or_else(|_| error::error(
273281
}
274282
Self::NotEqual | Self::Equal => {
275283
if args.len() != 2 {
276-
error::error(
277-
line,
278-
format!("Expected 2 arguments for {self:?} operator"),
279-
);
284+
error::error(line, format!("Expected 2 arguments for {self:?} operator"));
280285
}
281286
let type_ = &args[0];
282287
let type_1 = &args[1];
@@ -298,22 +303,15 @@ let number: FloatLiteral = string.parse().map_or_else(|_| error::error(
298303
}
299304
Self::Or | Self::And => {
300305
if args.len() != 2 {
301-
error::error(
302-
line,
303-
format!("Expected 2 arguments for {self:?} operator"),
304-
);
306+
error::error(line, format!("Expected 2 arguments for {self:?} operator"));
305307
}
306308
let bool_1 = match &args[0] {
307309
LiteralType::Boolean(boolean) => boolean,
308-
_ => {
309-
error::error(line, format!("Expected boolean for {self:?} operator"))
310-
}
310+
_ => error::error(line, format!("Expected boolean for {self:?} operator")),
311311
};
312312
let bool_2 = match &args[1] {
313313
LiteralType::Boolean(boolean) => boolean,
314-
_ => {
315-
error::error(line, format!("Expected boolean for {self:?} operator"))
316-
}
314+
_ => error::error(line, format!("Expected boolean for {self:?} operator")),
317315
};
318316
if bool_1 == bool_2 {
319317
if bool_1 == &true {
@@ -327,10 +325,7 @@ let number: FloatLiteral = string.parse().map_or_else(|_| error::error(
327325
}
328326
Self::GreaterThan | Self::LessThan | Self::GreaterEqual | Self::LessEqual => {
329327
if args.len() != 2 {
330-
error::error(
331-
line,
332-
format!("Expected 2 arguments for {self:?} operator"),
333-
);
328+
error::error(line, format!("Expected 2 arguments for {self:?} operator"));
334329
}
335330
let type_ = match &args[0] {
336331
LiteralType::Number(number) => number,
@@ -354,10 +349,9 @@ let number: FloatLiteral = string.parse().map_or_else(|_| error::error(
354349
if args.len() == 1 {
355350
match &args[0] {
356351
LiteralType::Number(number) => exit(*number as i32),
357-
_ => error::error(
358-
line,
359-
format!("Expected number for {self:?} operator"),
360-
),
352+
_ => {
353+
error::error(line, format!("Expected number for {self:?} operator"))
354+
}
361355
}
362356
} else {
363357
error::error(line, format!("Expected 1 argument for {self:?} operator"));
@@ -380,7 +374,12 @@ let number: FloatLiteral = string.parse().map_or_else(|_| error::error(
380374
};
381375
// check if there is a third argument (number)
382376
args.get(2).map_or_else(
383-
|| og_string.split_once(split_on).map_or_else(|| LiteralType::String(og_string.to_string()), |v| LiteralType::String(v.0.to_string())),
377+
|| {
378+
og_string.split_once(split_on).map_or_else(
379+
|| LiteralType::String(og_string.to_string()),
380+
|v| LiteralType::String(v.0.to_string()),
381+
)
382+
},
384383
|number| -> LiteralType {
385384
if let LiteralType::Number(number) = number {
386385
let number = *number as usize;
@@ -398,13 +397,12 @@ let number: FloatLiteral = string.parse().map_or_else(|_| error::error(
398397
string.iter().take(number).for_each(|i: &&str| {
399398
ret_string.push_str(i);
400399
});
401-
let ret_string = ret_string.rsplit_once(split_on).map_or(og_string.to_string(), |string| string.0.to_string());
400+
let ret_string = ret_string
401+
.rsplit_once(split_on)
402+
.map_or(og_string.to_string(), |string| string.0.to_string());
402403
LiteralType::String(ret_string)
403404
} else {
404-
error::error(
405-
line,
406-
format!("Expected number for {self:?} operator"),
407-
)
405+
error::error(line, format!("Expected number for {self:?} operator"))
408406
}
409407
},
410408
)

0 commit comments

Comments
 (0)