kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Convert args length check to debug assert

Browse Source
This commit is contained in:
J Henry Waugh 2020-08-13 22:06:30 -05:00
parent db9d8b81cf
commit 3ccc08b6e0
2 changed files with 25 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
codegen/src/function.rs
View File

@ -485,11 +485,9 @@ impl ExportedFn {
fn call(&self, fn call(&self,
args: &mut [&mut Dynamic], pos: Position args: &mut [&mut Dynamic], pos: Position
) -> Result<Dynamic, Box<EvalAltResult>> { ) -> Result<Dynamic, Box<EvalAltResult>> {
if args.len() != #arg_count { debug_assert_eq!(args.len(), #arg_count,
return Err(Box::new(EvalAltResult::ErrorRuntime( "wrong arg count: {} != {}",
format!("wrong arg count: {} != {}", args.len(), #arg_count);
args.len(), #arg_count), Position::none())));
}
#(#unpack_stmts)* #(#unpack_stmts)*
#return_expr #return_expr
} }
@ -778,11 +776,8 @@ mod generate_tests {
fn call(&self, fn call(&self,
args: &mut [&mut Dynamic], pos: Position args: &mut [&mut Dynamic], pos: Position
) -> Result<Dynamic, Box<EvalAltResult>> { ) -> Result<Dynamic, Box<EvalAltResult>> {
if args.len() != 0usize { debug_assert_eq!(args.len(), 0usize,
return Err(Box::new(EvalAltResult::ErrorRuntime( "wrong arg count: {} != {}", args.len(), 0usize);
format!("wrong arg count: {} != {}",
args.len(), 0usize), Position::none())));
}
Ok(Dynamic::from(do_nothing())) Ok(Dynamic::from(do_nothing()))
} }
@ -825,11 +820,8 @@ mod generate_tests {
fn call(&self, fn call(&self,
args: &mut [&mut Dynamic], pos: Position args: &mut [&mut Dynamic], pos: Position
) -> Result<Dynamic, Box<EvalAltResult>> { ) -> Result<Dynamic, Box<EvalAltResult>> {
if args.len() != 1usize { debug_assert_eq!(args.len(), 1usize,
return Err(Box::new(EvalAltResult::ErrorRuntime( "wrong arg count: {} != {}", args.len(), 1usize);
format!("wrong arg count: {} != {}",
args.len(), 1usize), Position::none())));
}
let arg0 = mem::take(args[0usize]).clone().cast::<usize>(); let arg0 = mem::take(args[0usize]).clone().cast::<usize>();
Ok(Dynamic::from(do_something(arg0))) Ok(Dynamic::from(do_something(arg0)))
} }
@ -869,11 +861,8 @@ mod generate_tests {
fn call(&self, fn call(&self,
args: &mut [&mut Dynamic], pos: Position args: &mut [&mut Dynamic], pos: Position
) -> Result<Dynamic, Box<EvalAltResult>> { ) -> Result<Dynamic, Box<EvalAltResult>> {
if args.len() != 1usize { debug_assert_eq!(args.len(), 1usize,
return Err(Box::new(EvalAltResult::ErrorRuntime( "wrong arg count: {} != {}", args.len(), 1usize);
format!("wrong arg count: {} != {}",
args.len(), 1usize), Position::none())));
}
let arg0 = mem::take(args[0usize]).clone().cast::<usize>(); let arg0 = mem::take(args[0usize]).clone().cast::<usize>();
Ok(Dynamic::from(do_something(arg0))) Ok(Dynamic::from(do_something(arg0)))
} }
@ -906,11 +895,8 @@ mod generate_tests {
fn call(&self, fn call(&self,
args: &mut [&mut Dynamic], pos: Position args: &mut [&mut Dynamic], pos: Position
) -> Result<Dynamic, Box<EvalAltResult>> { ) -> Result<Dynamic, Box<EvalAltResult>> {
if args.len() != 2usize { debug_assert_eq!(args.len(), 2usize,
return Err(Box::new(EvalAltResult::ErrorRuntime( "wrong arg count: {} != {}", args.len(), 2usize);
format!("wrong arg count: {} != {}",
args.len(), 2usize), Position::none())));
}
let arg0 = mem::take(args[0usize]).clone().cast::<usize>(); let arg0 = mem::take(args[0usize]).clone().cast::<usize>();
let arg1 = mem::take(args[1usize]).clone().cast::<usize>(); let arg1 = mem::take(args[1usize]).clone().cast::<usize>();
Ok(Dynamic::from(add_together(arg0, arg1))) Ok(Dynamic::from(add_together(arg0, arg1)))
@ -956,11 +942,8 @@ mod generate_tests {
fn call(&self, fn call(&self,
args: &mut [&mut Dynamic], pos: Position args: &mut [&mut Dynamic], pos: Position
) -> Result<Dynamic, Box<EvalAltResult>> { ) -> Result<Dynamic, Box<EvalAltResult>> {
if args.len() != 2usize { debug_assert_eq!(args.len(), 2usize,
return Err(Box::new(EvalAltResult::ErrorRuntime( "wrong arg count: {} != {}", args.len(), 2usize);
format!("wrong arg count: {} != {}",
args.len(), 2usize), Position::none())));
}
let arg1 = mem::take(args[1usize]).clone().cast::<usize>(); let arg1 = mem::take(args[1usize]).clone().cast::<usize>();
let arg0: &mut _ = &mut args[0usize].write_lock::<usize>().unwrap(); let arg0: &mut _ = &mut args[0usize].write_lock::<usize>().unwrap();
Ok(Dynamic::from(increment(arg0, arg1))) Ok(Dynamic::from(increment(arg0, arg1)))
@ -1007,11 +990,8 @@ mod generate_tests {
fn call(&self, fn call(&self,
args: &mut [&mut Dynamic], pos: Position args: &mut [&mut Dynamic], pos: Position
) -> Result<Dynamic, Box<EvalAltResult>> { ) -> Result<Dynamic, Box<EvalAltResult>> {
if args.len() != 1usize { debug_assert_eq!(args.len(), 1usize,
return Err(Box::new(EvalAltResult::ErrorRuntime( "wrong arg count: {} != {}", args.len(), 1usize);
format!("wrong arg count: {} != {}",
args.len(), 1usize), Position::none())));
}
let arg0 = mem::take(args[0usize]).clone().cast::<ImmutableString>(); let arg0 = mem::take(args[0usize]).clone().cast::<ImmutableString>();
Ok(Dynamic::from(special_print(&arg0))) Ok(Dynamic::from(special_print(&arg0)))
} }

35
codegen/src/module.rs
View File

@ -314,11 +314,8 @@ mod generate_tests {
fn call(&self, fn call(&self,
args: &mut [&mut Dynamic], pos: Position args: &mut [&mut Dynamic], pos: Position
) -> Result<Dynamic, Box<EvalAltResult>> { ) -> Result<Dynamic, Box<EvalAltResult>> {
if args.len() != 0usize { debug_assert_eq!(args.len(), 0usize,
return Err(Box::new(EvalAltResult::ErrorRuntime( "wrong arg count: {} != {}", args.len(), 0usize);
format!("wrong arg count: {} != {}",
args.len(), 0usize), Position::none())));
}
Ok(Dynamic::from(get_mystic_number())) Ok(Dynamic::from(get_mystic_number()))
} }
@ -374,11 +371,8 @@ mod generate_tests {
fn call(&self, fn call(&self,
args: &mut [&mut Dynamic], pos: Position args: &mut [&mut Dynamic], pos: Position
) -> Result<Dynamic, Box<EvalAltResult>> { ) -> Result<Dynamic, Box<EvalAltResult>> {
if args.len() != 1usize { debug_assert_eq!(args.len(), 1usize,
return Err(Box::new(EvalAltResult::ErrorRuntime( "wrong arg count: {} != {}", args.len(), 1usize);
format!("wrong arg count: {} != {}",
args.len(), 1usize), Position::none())));
}
let arg0 = mem::take(args[0usize]).clone().cast::<INT>(); let arg0 = mem::take(args[0usize]).clone().cast::<INT>();
Ok(Dynamic::from(add_one_to(arg0))) Ok(Dynamic::from(add_one_to(arg0)))
} }
@ -436,11 +430,8 @@ mod generate_tests {
fn call(&self, fn call(&self,
args: &mut [&mut Dynamic], pos: Position args: &mut [&mut Dynamic], pos: Position
) -> Result<Dynamic, Box<EvalAltResult>> { ) -> Result<Dynamic, Box<EvalAltResult>> {
if args.len() != 2usize { debug_assert_eq!(args.len(), 2usize,
return Err(Box::new(EvalAltResult::ErrorRuntime( "wrong arg count: {} != {}", args.len(), 2usize);
format!("wrong arg count: {} != {}",
args.len(), 2usize), Position::none())));
}
let arg0 = mem::take(args[0usize]).clone().cast::<INT>(); let arg0 = mem::take(args[0usize]).clone().cast::<INT>();
let arg1 = mem::take(args[1usize]).clone().cast::<INT>(); let arg1 = mem::take(args[1usize]).clone().cast::<INT>();
Ok(Dynamic::from(add_together(arg0, arg1))) Ok(Dynamic::from(add_together(arg0, arg1)))
@ -608,11 +599,8 @@ mod generate_tests {
fn call(&self, fn call(&self,
args: &mut [&mut Dynamic], pos: Position args: &mut [&mut Dynamic], pos: Position
) -> Result<Dynamic, Box<EvalAltResult>> { ) -> Result<Dynamic, Box<EvalAltResult>> {
if args.len() != 1usize { debug_assert_eq!(args.len(), 1usize,
return Err(Box::new(EvalAltResult::ErrorRuntime( "wrong arg count: {} != {}", args.len(), 1usize);
format!("wrong arg count: {} != {}",
args.len(), 1usize), Position::none())));
}
let arg0 = mem::take(args[0usize]).clone().cast::<ImmutableString>(); let arg0 = mem::take(args[0usize]).clone().cast::<ImmutableString>();
Ok(Dynamic::from(print_out_to(&arg0))) Ok(Dynamic::from(print_out_to(&arg0)))
} }
@ -670,11 +658,8 @@ mod generate_tests {
fn call(&self, fn call(&self,
args: &mut [&mut Dynamic], pos: Position args: &mut [&mut Dynamic], pos: Position
) -> Result<Dynamic, Box<EvalAltResult>> { ) -> Result<Dynamic, Box<EvalAltResult>> {
if args.len() != 1usize { debug_assert_eq!(args.len(), 1usize,
return Err(Box::new(EvalAltResult::ErrorRuntime( "wrong arg count: {} != {}", args.len(), 1usize);
format!("wrong arg count: {} != {}",
args.len(), 1usize), Position::none())));
}
let arg0: &mut _ = &mut args[0usize].write_lock::<FLOAT>().unwrap(); let arg0: &mut _ = &mut args[0usize].write_lock::<FLOAT>().unwrap();
Ok(Dynamic::from(increment(arg0))) Ok(Dynamic::from(increment(arg0)))
} }