Mercurial Hosting > luan
diff src/luan/modules/ThreadLuan.java @ 1389:eb8b35dccd99
cleanup and stringify change
| author | Franklin Schmidt <fschmidt@gmail.com> |
|---|---|
| date | Tue, 03 Sep 2019 22:54:31 -0600 |
| parents | 8d7a39ca2c0c |
| children | ef1620aa99cb |
line wrap: on
line diff
--- a/src/luan/modules/ThreadLuan.java Tue Sep 03 22:12:53 2019 -0600 +++ b/src/luan/modules/ThreadLuan.java Tue Sep 03 22:54:31 2019 -0600 @@ -49,16 +49,15 @@ throws LuanException { Map map = options.asMap(); - Number delay = (Number)map.remove("delay"); - Number repeatingDelay = (Number)map.remove("repeating_delay"); - Number repeatingRate = (Number)map.remove("repeating_rate"); - boolean daemon = Boolean.TRUE.equals(map.remove("daemon")); - final boolean runOnClose = Boolean.TRUE.equals(map.remove("run_on_close")); + Number delay = Utils.removeNumber(map,"delay"); + Number repeatingDelay = Utils.removeNumber(map,"repeating_delay"); + Number repeatingRate = Utils.removeNumber(map,"repeating_rate"); + boolean daemon = Boolean.TRUE.equals(Utils.removeBoolean(map,"daemon")); + final boolean runOnClose = Boolean.TRUE.equals(Utils.removeBoolean(map,"run_on_close")); if( repeatingDelay!=null && repeatingRate!=null ) throw new LuanException("can't define both repeating_delay and repeating_rate"); boolean repeating = repeatingDelay!=null || repeatingRate!=null; - if( !map.isEmpty() ) - throw new LuanException( "unrecognized options: "+map ); + Utils.checkEmpty(map); Luan luan = fn.luan(); LuanCloner cloner = new LuanCloner(LuanCloner.Type.COMPLETE); final Luan newLuan = (Luan)cloner.clone(luan);