From 23555bf2fd7b5c69abe2ef18e6ab5c1f558fd745 Mon Sep 17 00:00:00 2001 From: Matthew Dean Date: Fri, 24 Nov 2023 09:27:41 +0000 Subject: [PATCH] Allow equality between different token types --- Cargo.lock | 2 +- tools/lang/Cargo.toml | 2 +- tools/lang/src/compiler/condition_transform.rs | 16 ---------------- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b5ccc793..df075e5f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1703,7 +1703,7 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dscp-lang" -version = "0.1.0" +version = "0.1.1" dependencies = [ "clap", "dscp-runtime-types", diff --git a/tools/lang/Cargo.toml b/tools/lang/Cargo.toml index 30a05ce8..975ab296 100644 --- a/tools/lang/Cargo.toml +++ b/tools/lang/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "dscp-lang" authors = ['Digital Catapult '] -version = "0.1.0" +version = "0.1.1" edition = "2021" [dependencies] diff --git a/tools/lang/src/compiler/condition_transform.rs b/tools/lang/src/compiler/condition_transform.rs index 8640ca3c..5db1c519 100644 --- a/tools/lang/src/compiler/condition_transform.rs +++ b/tools/lang/src/compiler/condition_transform.rs @@ -274,22 +274,6 @@ pub fn transform_condition_to_program( }), }?; - if input.arg.token_type.value != output.arg.token_type.value { - return Err(CompilationError { - stage: crate::compiler::CompilationStage::GenerateRestrictions, - exit_code: exitcode::DATAERR, - inner: PestError::new_from_span( - ErrorVariant::CustomError { - message: format!( - "Invalid comparison between token type {} and {}", - input.arg.token_type.value, output.arg.token_type.value - ), - }, - span, - ), - }); - } - let original_key = TokenMetadataKey::try_from(ORIGINAL_ID_KEY.to_vec()).unwrap(); let result = vec![ BooleanExpressionSymbol::Restriction(Restriction::MatchInputOutputMetadataValue {