From 0883b51a6ad78e8553414d26c55fb7081b12c218 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 21 Nov 2020 00:55:34 +0000 Subject: [PATCH] lower: fix order of range Signed-off-by: Ian Jackson --- templates/script.ts | 2 +- zcoord/zcoord.rs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/templates/script.ts b/templates/script.ts index 607571a9..f0e31af1 100644 --- a/templates/script.ts +++ b/templates/script.ts @@ -494,7 +494,7 @@ function lower_pieces(targets_todo: LowerTodoList): wasm_bindgen.def_zcoord(); type PlanEntry = { - content: Entry[], + content: Entry[], // bottom to top z_top: ZCoord | null, z_bot: ZCoord | null, }; diff --git a/zcoord/zcoord.rs b/zcoord/zcoord.rs index 937b6de3..adda1987 100644 --- a/zcoord/zcoord.rs +++ b/zcoord/zcoord.rs @@ -407,8 +407,12 @@ impl Mutable { match (a, b) { (None, None ) => throw!(TotallyUnboundedRange), (Some(a), None ) => mk( a.clone().iter(Increment) ), - (None, Some(b)) => mk( b.clone().iter(Decrement) ), (Some(a), Some(b)) => mk( Mutable::range_upto(&a,&b,count)? ), + (None, Some(b)) => mk({ + let mut first = b.clone(); + first.addsub(&Decrement).unwrap(); + Mutable::range_upto(&first,&b,count)? + }), } } -- 2.30.2