Merging unknown and other semantics

Fixes #167
mumuki · May 3, 2018 · b26c8b8 · b26c8b8
1 parent 53d9dc9
commit b26c8b8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/spec/InspectorSpec.hs b/spec/InspectorSpec.hs
@@ -94,7 +94,7 @@ spec = do
 
     it "is False otherwise" $ do
       assigns (named "x") (Assignment "y" (MuTrue)) `shouldBe` False
-      assigns (named "x") (Other) `shouldBe` False
+      assigns (named "x") (Other Nothing Nothing) `shouldBe` False
       assigns (named "x") (MuFalse) `shouldBe` False
 
   describe "declaresFunction" $ do

diff --git a/src/Language/Mulang/Ast.hs b/src/Language/Mulang/Ast.hs
@@ -26,8 +26,6 @@ module Language.Mulang.Ast (
     debug,
     debugType,
     debugPattern,
-    pattern Other,
-    pattern OtherBody,
     pattern SimpleEquation,
     pattern SimpleFunction,
     pattern SimpleProcedure,
@@ -166,7 +164,7 @@ data Expression
     -- ^ Imperative / OOP programming c-style for loop
     | Sequence [Expression]
     -- ^ Generic sequence of statements
-    | Unknown (Maybe String) (Maybe Expression)
+    | Other (Maybe String) (Maybe Expression)
     -- ^ Unrecognized expression, with optional description and body
     | Equal
     | NotEqual
@@ -222,7 +220,7 @@ data Statement
   deriving (Eq, Show, Read, Generic)
 
 debug :: Show a => a -> Expression
-debug a = Unknown (Just (show a)) Nothing
+debug a = Other (Just (show a)) Nothing
 
 debugType :: Show a => a -> Type
 debugType a = OtherType (Just (show a)) Nothing
@@ -234,9 +232,6 @@ pattern VariableSignature name t cs        = TypeSignature name (SimpleType t cs
 pattern SubroutineSignature name args t cs = TypeSignature name (ParameterizedType args t cs)
 pattern ModuleSignature name cs            = TypeSignature name (ConstrainedType cs)
 
-pattern Other = Unknown Nothing Nothing
-pattern OtherBody body <- Unknown _ (Just body)
-
 pattern SimpleEquation params body = Equation params (UnguardedBody body)
 
 pattern SimpleSend receptor selector args = Send receptor (Reference selector) args

diff --git a/src/Language/Mulang/Generator.hs b/src/Language/Mulang/Generator.hs
@@ -71,7 +71,7 @@ expressions expr = expr : concatMap expressions (subExpressions expr)
     subExpressions (New _ es)              = es
     subExpressions (Not e)                 = [e]
     subExpressions (Object _ v)            = [v]
-    subExpressions (OtherBody e)           = [e]
+    subExpressions (Other _ (Just e))      = [e]
     subExpressions (Repeat e1 e2)          = [e1, e2]
     subExpressions (Return v)              = [v]
     subExpressions (Sequence es)           = es