examples/tty-04-posint/src/main.rs

@@ -32,6 +32,28 @@ use {
     std::sync::{Arc, RwLock},
 };
 
+fn setup_hex_master(ctx: &Arc<RwLock<Context>>, rt_int: &Arc<RwLock<ReprTree>>) {
+    rt_int.write().unwrap().detach( ctx );
+    ctx.read().unwrap().apply_morphism(
+        rt_int,
+        &laddertypes::MorphismType {
+            src_type: Context::parse(&ctx, "ℕ ~ <PosInt 16 BigEndian> ~ <Seq <Digit 16>> ~ <List <Digit 16> ~ Char> ~ EditTree"),
+            dst_type: Context::parse(&ctx, "ℕ ~ <PosInt 10 BigEndian> ~ <Seq <Digit 10>> ~ <List <Digit 10> ~ Char> ~ EditTree")
+        }
+    );
+}
+
+fn setup_dec_master(ctx: &Arc<RwLock<Context>>, rt_int: &Arc<RwLock<ReprTree>>) {
+    rt_int.write().unwrap().detach( ctx );
+    ctx.read().unwrap().apply_morphism(
+        rt_int,
+        &laddertypes::MorphismType {
+            src_type: Context::parse(&ctx, "ℕ ~ <PosInt 10 BigEndian> ~ <Seq <Digit 10>> ~ <List <Digit 10> ~ Char> ~ EditTree"),
+            dst_type: Context::parse(&ctx, "ℕ ~ <PosInt 16 BigEndian> ~ <Seq <Digit 16>> ~ <List <Digit 16> ~ Char> ~ EditTree")
+        }
+    );
+}
+
 #[async_std::main]
 async fn main() {
     /* setup context
@@ -70,16 +92,7 @@ async fn main() {
             dst_type: Context::parse(&ctx, "ℕ ~ <PosInt 16 BigEndian> ~ <Seq <Digit 16>> ~ <List <Digit 16> ~ Char> ~ EditTree")
         });
 
-    /* set Hex-editor to be master
+    setup_hex_master(&ctx, &rt_int);
-     */
-    rt_int.write().unwrap().detach( &ctx );
-    ctx.read().unwrap().apply_morphism(
-        &rt_int,
-        &laddertypes::MorphismType {
-            src_type: Context::parse(&ctx, "ℕ ~ <PosInt 16 BigEndian> ~ <Seq <Digit 16>> ~ <List <Digit 16> ~ Char> ~ EditTree"),
-            dst_type: Context::parse(&ctx, "ℕ ~ <PosInt 10 BigEndian> ~ <Seq <Digit 10>> ~ <List <Digit 10> ~ Char> ~ EditTree")
-        }
-    );
 
     let edittree_hex_be_list = ctx.read().unwrap()
         .setup_edittree(
@@ -161,24 +174,14 @@ async fn main() {
                     0 => {
                         let mut li = last_idx.write().unwrap();
                         if *li != 0 {
-                            rt_int.write().unwrap().detach( &ctx );
+                            setup_hex_master(&ctx, &rt_int);
-                            ctx.read().unwrap().apply_morphism(&rt_int, &laddertypes::MorphismType {
-                                src_type: Context::parse(&ctx, "ℕ ~ <PosInt 16 BigEndian> ~ <Seq~List <Digit 16> ~ Char> ~ EditTree"),
-                                dst_type: Context::parse(&ctx, "ℕ ~ <PosInt 10 BigEndian> ~ <Seq~List <Digit 10> ~ Char> ~ EditTree")
-                            });
-
                             *li = 0;
                         }
                     }
                     1 => {
                         let mut li = last_idx.write().unwrap();
                         if *li != 1 {
-                            rt_int.write().unwrap().detach( &ctx );
+                            setup_dec_master(&ctx, &rt_int);
-                            ctx.read().unwrap().apply_morphism(&rt_int, &laddertypes::MorphismType {
-                                src_type: Context::parse(&ctx, "ℕ ~ <PosInt 10 BigEndian> ~ <Seq~List <Digit 10> ~ Char> ~ EditTree"),
-                                dst_type: Context::parse(&ctx, "ℕ ~ <PosInt 16 BigEndian> ~ <Seq~List <Digit 16> ~ Char> ~ EditTree")
-                            });
-
                             *li = 1;
                         }
                     }

lib-nested-core/src/editors/integer/radix.rs

@@ -113,13 +113,9 @@ impl RadixProjection {
 
         if let Some(src) = self.src.as_ref() {
             let mut val = src.get_value();
-            if val == 0 {
+            while val > 0 {
-                self.dst_digits.push(0);
+                self.dst_digits.push(val % self.dst_radix);
-            } else {
+                val /= self.dst_radix;
-                while val > 0 {
-                    self.dst_digits.push(val % self.dst_radix);
-                    val /= self.dst_radix;
-                }
             }
         }