phino 0.0.0.34 → 0.0.0.35

raw patch · 5 files changed

+37/−10 lines, 5 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

phino.cabal +1/−1
src/Functions.hs +18/−0
src/Rewriter.hs +0/−1
src/Rule.hs +1/−1
test/RuleSpec.hs +17/−7

phino.cabal view

@@ -1,7 +1,7 @@ cabal-version:      3.0  name:               phino-version:            0.0.0.34+version:            0.0.0.35 license:            MIT synopsis:           Command-Line Manipulator of 𝜑-Calculus Expressions description:        Please see the README on GitHub at <https://github.com/objectionary/phino#readme>

src/Functions.hs view

@@ -145,4 +145,22 @@   attr <- parseAttributeThrows (btsToUnescapedStr bts)   pure (TeAttribute attr) buildTermFromFunction "tau" _ _ _ = throwIO (userError "Function tau() requires exactly 1 argument as expression")+buildTermFromFunction "string" [Y.ArgExpression expr] subst _ = do+  (expr', _) <- buildExpressionThrows expr subst+  str <- case expr' of+    DataNumber bts -> pure (DataString (strToBts (either show show (btsToNum bts))))+    DataString bts -> pure (DataString bts)+    exp ->+      throwIO+        ( userError+            ( printf+                "Couldn't convert given expression to 'Φ̇.string' object, only 'Φ̇.number' or 'Φ̇.string' are allowed\n%s"+                (prettyExpression' exp)+            )+        )+  pure (TeExpression str)+buildTermFromFunction "string" [Y.ArgAttribute attr] subst _ = do+  attr' <- buildAttributeThrows attr subst+  pure (TeExpression (DataString (strToBts (prettyAttribute attr'))))+buildTermFromFunction "string" _ _ _ = throwIO (userError "Function string() requires exactly 1 argument as attribute or data expression (Φ̇.number or Φ̇.string)") buildTermFromFunction func _ _ _ = throwIO (userError (printf "Function %s() is not supported or does not exist" func))

src/Rewriter.hs view

@@ -13,7 +13,6 @@ import Data.Foldable (foldlM) import qualified Data.Map.Strict as M import Data.Maybe (catMaybes, fromMaybe, isJust)-import Debug.Trace (trace) import Logger (logDebug) import Matcher (MetaValue (MvAttribute, MvBindings, MvBytes, MvExpression), Subst (Subst), combine, combineMany, defaultScope, matchProgram, substEmpty, substSingle) import Misc (ensuredFile)

src/Rule.hs view

@@ -92,7 +92,7 @@ isNF expr ctx = not (matchesAnyNormalizationRule expr ctx)  meetCondition' :: Y.Condition -> Subst -> RuleContext -> IO [Subst]-meetCondition' (Y.Or []) subst _ = pure [subst]+meetCondition' (Y.Or []) _ _ = pure [] meetCondition' (Y.Or (cond : rest)) subst ctx = do   met <- meetCondition' cond subst ctx   if null met

test/RuleSpec.hs view

@@ -21,7 +21,8 @@ import Yaml qualified  data ConditionPack = ConditionPack-  { expression :: Expression,+  { failure :: Maybe Bool,+    expression :: Expression,     pattern :: Expression,     condition :: Yaml.Condition   }@@ -39,10 +40,19 @@         let matched = matchProgram (pattern pack) prog         unless (matched /= []) (expectationFailure "List of matched substitutions is empty which is not expected")         met <- meetCondition (condition pack) matched (RuleContext prog buildTermFromFunction)-        when-          (null met)-          ( expectationFailure $-              "List of substitution after condition check must be not empty\nOriginal substitutions:\n"-                ++ prettySubsts matched-          )+        case failure pack of+          Just True ->+            unless+              (null met)+              ( expectationFailure $+                  "List of substitutions after condition check must be empty, but got:\n"+                    ++ prettySubsts matched+              )+          _ ->+            when+              (null met)+              ( expectationFailure $+                  "List of substitution after condition check must be not empty\nOriginal substitutions:\n"+                    ++ prettySubsts matched+              )     )