Renamed instructions. dis to dgs and dir to dgr

neoneye · neoneye · commit 2a7fade1376d · 2025-01-19T14:42:17.000+01:00
diff --git a/rust_project/loda-rust-core/src/parser/instruction_id.rs b/rust_project/loda-rust-core/src/parser/instruction_id.rs
@@ -44,8 +44,8 @@ impl fmt::Display for InstructionId {
             Self::BitwiseXor     => "bxo",
             Self::EvalSequence   => "seq",
             Self::Compare        => "cmp",
-            Self::DigitalRoot    => "dir",
-            Self::DigitSum       => "dis",
+            Self::DigitalRoot    => "dgr",
+            Self::DigitSum       => "dgs",
             Self::Divide         => "div",
             Self::DivideIf       => "dif",
             Self::Equal          => "equ",
diff --git a/rust_project/loda-rust-core/src/parser/parse_instruction_id.rs b/rust_project/loda-rust-core/src/parser/parse_instruction_id.rs
@@ -29,8 +29,8 @@ impl ParseInstructionId for InstructionId {
             "bxo" => Ok(Self::BitwiseXor),
             "cmp" => Ok(Self::Compare),
             "dif" => Ok(Self::DivideIf),
-            "dir" => Ok(Self::DigitalRoot),
-            "dis" => Ok(Self::DigitSum),
+            "dgr" => Ok(Self::DigitalRoot),
+            "dgs" => Ok(Self::DigitSum),
             "div" => Ok(Self::Divide),
             "equ" => Ok(Self::Equal),
             "gcd" => Ok(Self::GCD),
@@ -111,9 +111,13 @@ mod tests {
             assert_eq!(instruction_id, InstructionId::NthRoot);
         }
         {
-            let instruction_id: InstructionId = InstructionId::parse("dis", 1).expect("InstructionId");
+            let instruction_id: InstructionId = InstructionId::parse("dgs", 1).expect("InstructionId");
             assert_eq!(instruction_id, InstructionId::DigitSum);
         }
+        {
+            let instruction_id: InstructionId = InstructionId::parse("dgr", 1).expect("InstructionId");
+            assert_eq!(instruction_id, InstructionId::DigitalRoot);
+        }
         {
             let instruction_id: InstructionId = InstructionId::parse("lps", 1).expect("InstructionId");
             assert_eq!(instruction_id, InstructionId::UnofficialLoopBeginSubtract);
diff --git a/rust_project/loda-rust-web/index.html b/rust_project/loda-rust-web/index.html
@@ -1,6 +1,6 @@
 <!doctype html><html lang="en"><head><meta charset="utf-8">
 <meta name="robots" content="noindex">
-<!-- LODA-RUST WASM project was last updated: 2024 Dec 12. -->
+<!-- LODA-RUST WASM project was last updated: 2025 Jan 19. -->
 <title>Edit</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="format-detection" content="telephone=no">
diff --git a/rust_project/loda-rust-web/web/codemirror_mode_loda.js b/rust_project/loda-rust-web/web/codemirror_mode_loda.js
@@ -15,7 +15,7 @@
         {regex: /[$][$]\d+/, token: "number"},
         {regex: /[$]\d+/, token: "number"},
         {regex: /-?\d+/, token: "number"},
-        {regex: /\s*(?:mov|add|sub|trn|mul|div|dif|mod|pow|gcd|bin|cmp|min|max|log|lpb|lpe|nrt|dis|dir|equ|neq|leq|geq|ban|bor|bxo|seq|lps|f\d\d)\b/,
+        {regex: /\s*(?:mov|add|sub|trn|mul|div|dif|mod|pow|gcd|bin|cmp|min|max|log|lpb|lpe|nrt|dgs|dgr|equ|neq|leq|geq|ban|bor|bxo|seq|lps|f\d\d)\b/,
           token: "keyword", sol: true },
         {regex: /#offset\s+(0|-?[1-9]\d*)$/, token: "keyword", sol: true},
         {regex: /;.*/, token: "comment"},
