From 8ee2c39bffc485a3a9cadfaa91af191637331b0e Mon Sep 17 00:00:00 2001 From: Abdelrahman Abounegm Date: Fri, 2 Feb 2024 19:59:53 +0300 Subject: [PATCH] Reorder branches to match the order in syntax file --- eo-phi-normalizer/src/Language/EO/Phi/Rules/Yaml.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eo-phi-normalizer/src/Language/EO/Phi/Rules/Yaml.hs b/eo-phi-normalizer/src/Language/EO/Phi/Rules/Yaml.hs index c559c66bc..3863834e2 100644 --- a/eo-phi-normalizer/src/Language/EO/Phi/Rules/Yaml.hs +++ b/eo-phi-normalizer/src/Language/EO/Phi/Rules/Yaml.hs @@ -79,13 +79,13 @@ convertRule Rule{..} ctx obj = ] objectHasMetavars :: Object -> Bool -objectHasMetavars (MetaObject _) = True objectHasMetavars (Formation bindings) = any bindingHasMetavars bindings objectHasMetavars (Application object bindings) = objectHasMetavars object || any bindingHasMetavars bindings objectHasMetavars (ObjectDispatch object attr) = objectHasMetavars object || attrHasMetavars attr objectHasMetavars (GlobalDispatch attr) = attrHasMetavars attr objectHasMetavars (ThisDispatch attr) = attrHasMetavars attr objectHasMetavars Termination = False +objectHasMetavars (MetaObject _) = True bindingHasMetavars :: Binding -> Bool bindingHasMetavars (AlphaBinding attr obj) = attrHasMetavars attr || objectHasMetavars obj @@ -95,13 +95,13 @@ bindingHasMetavars (LambdaBinding _) = False bindingHasMetavars (MetaBindings _) = True attrHasMetavars :: Attribute -> Bool -attrHasMetavars (MetaAttr _) = True attrHasMetavars Phi = False attrHasMetavars Rho = False attrHasMetavars Sigma = False attrHasMetavars VTX = False attrHasMetavars (Label _) = False attrHasMetavars (Alpha _) = False +attrHasMetavars (MetaAttr _) = True -- | Given a condition, and a substition from object matching -- tells whether the condition matches the object