fix: fork and fix in planet notation shorthand (#776)

Author: magistau

parser/src/split.rs

@@ -263,18 +263,17 @@ pub fn split_name(name: &str) -> Option<Vec<(PrimComponent, &str)>> {
                 continue;
             }
             // 1-letter planet notation
-            if sub_name
-                .strip_prefix('f')
-                .unwrap_or(sub_name)
-                .strip_suffix(['i', 'p'])
-                .unwrap_or(sub_name)
+            let unforked = sub_name.strip_prefix('f').unwrap_or(sub_name);
+            if unforked
+                .strip_suffix(['i', 'p', 'f'])
+                .unwrap_or(unforked)
                 .chars()
                 .all(|c| "gd".contains(c))
-                && sub_name != "fi"
             {
                 for (i, c) in sub_name.char_indices() {
                     let prim = match c {
-                        'f' => Primitive::Fork,
+                        'f' if i == 0 => Primitive::Fork,
+                        'f' => Primitive::Fix,
                         'g' => Primitive::Gap,
                         'd' => Primitive::Dip,
                         'i' => Primitive::Identity,
@@ -286,24 +285,6 @@ pub fn split_name(name: &str) -> Option<Vec<(PrimComponent, &str)>> {
                 start += len;
                 continue 'outer;
             }
-            // Dip fix
-            if sub_name
-                .strip_suffix('f')
-                .unwrap_or(sub_name)
-                .chars()
-                .all(|c| c == 'd')
-            {
-                for (i, c) in sub_name.char_indices() {
-                    let prim = match c {
-                        'd' => Primitive::Dip,
-                        'f' => Primitive::Fix,
-                        _ => unreachable!(),
-                    };
-                    prims.push((prim.into(), &sub_name[i..i + 1]))
-                }
-                start += len;
-                continue 'outer;
-            }
             // Aliases
             if let Some(ps) = Primitive::get_multi_alias(sub_name) {
                 prims.extend(ps.iter().map(|(p, s)| (*p, *s)));