#18 transformation and inlinement order bug fixed

Eliah-Lakhin · Jul 6, 2024 · fb02983 · fb02983
1 parent 771b108
commit fb02983
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/work/crates/derive/src/token/input.rs b/work/crates/derive/src/token/input.rs
@@ -205,8 +205,8 @@ impl TryFrom<DeriveInput> for TokenInput {
                         ));
                     }
 
-                    regex.transform(&TransformConfig::default());
                     regex.inline(&inline_map, &variant_map)?;
+                    regex.transform(&TransformConfig::default());
 
                     let _ = inline_map.insert(name, regex);
                 }
@@ -278,8 +278,8 @@ impl TryFrom<DeriveInput> for TokenInput {
 
             if let Some((_, rule)) = &mut variant.rule {
                 parsable += 1;
-                rule.transform(&TransformConfig::default());
                 rule.inline(&inline_map, &variant_map)?;
+                rule.transform(&TransformConfig::default());
                 alphabet.append(rule.alphabet());
             }
         }

diff --git a/work/crates/derive/src/token/regex.rs b/work/crates/derive/src/token/regex.rs
@@ -104,7 +104,7 @@ impl RegexImpl for Regex {
         match self {
             Self::Operand(Operand::Unresolved(_)) => system_panic!("Unresolved operand."),
 
-            Self::Operand(Operand::Dump(_, inner)) => inner.transform(config),
+            Self::Operand(Operand::Dump(_, inner)) => inner.transform(&TransformConfig::default()),
 
             Self::Operand(Operand::Transform(feature, inner)) => {
                 let mut inner = expect_some!(take(inner), "Empty transformation.",);