Merge pull request #405 from smucclaw/20230803-rpnary-map

add syntax for MAP operator, but not yet implemented
smucclaw · Aug 3, 2023 · 5c95cfe · 5c95cfe
2 parents 5a2abf5 + 83ff1eb
commit 5c95cfe
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/lib/haskell/natural4/src/LS/BasicTypes.hs b/lib/haskell/natural4/src/LS/BasicTypes.hs
@@ -73,7 +73,7 @@ data MyToken = Every | Party | TokAll
              | Then | Else
              | TNumber Float
              | Other Text.Text
-             | Do
+             | Do | FMap
              | TokTrue | TokFalse
              | Aka -- also known as, for AKA Receiving Party
              | Typically -- to provide default values
@@ -226,6 +226,8 @@ toToken "LIST OF"   = pure List1
 toToken "LISTOF"    = pure List1
 toToken "LIST"      = pure List1
 
+toToken "MAP"       = pure FMap
+
 toToken "AKA"       = pure Aka
 toToken "TYPICALLY" = pure Typically
 
@@ -416,6 +418,8 @@ renderToken Semicolon = ";;"
 renderToken SubjectTo = "SUBJECT TO"
 renderToken TokSum = "SUM"
 renderToken TokProduct = "PRODUCT"
+renderToken FMap = "MAP"
+
 
 renderToken tok = map toUpper (show tok)
 

diff --git a/lib/haskell/natural4/src/LS/RelationalPredicates.hs b/lib/haskell/natural4/src/LS/RelationalPredicates.hs
@@ -242,6 +242,7 @@ tok2rel = choice
     , RPlte     <$ pToken TokLTE
     , RPgt      <$ pToken TokGT    -- serves double duty as MaxOflist when in RPnary position
     , RPgte     <$ pToken TokGTE
+    , RPmap     <$ pToken FMap
     , RPelem    <$ pToken TokIn
     , RPnotElem <$ pToken TokNotIn
     , RPsubjectTo <$ pToken SubjectTo

diff --git a/lib/haskell/natural4/src/LS/Types.hs b/lib/haskell/natural4/src/LS/Types.hs
@@ -51,6 +51,7 @@ type BoolStructR = AA.OptionallyLabeledBoolStruct RelationalPredicate
 
 -- | the relations in a RelationalPredicate
 data RPRel = RPis | RPhas | RPeq | RPlt | RPlte | RPgt | RPgte | RPelem | RPnotElem | RPnot | RPand | RPor | RPsum | RPproduct | RPsubjectTo
+           | RPmap
            | RPTC TComparison -- ^ temporal constraint as part of a relational predicate; note there is a separate `TemporalConstraint` type.
   deriving (Eq, Ord, Show, Generic, ToJSON)
 
@@ -288,6 +289,7 @@ rel2txt RPnotElem = "NOT IN" -- "relNotIn"
 rel2txt RPnot     = "NOT"    -- "relNot"
 rel2txt RPand     = "&&"    -- "relAnd"
 rel2txt RPor      = "||"    -- "relOr"
+rel2txt RPmap     = "MAP"
 rel2txt RPsum     = "SUM"
 rel2txt RPproduct = "PRODUCT"
 rel2txt (RPTC TBefore) = "BEFORE"
@@ -309,6 +311,7 @@ rel2op RPnotElem = "NOT IN"
 rel2op RPnot     = "NOT"
 rel2op RPand     = "&&"
 rel2op RPor      = "||"
+rel2op RPmap     = "MAP"
 rel2op RPsum     = "SUM"
 rel2op RPproduct = "PRODUCT"
 rel2op (RPTC TBefore) = "BEFORE"