Removed typechecking

Well, it's unnecessary complexity :D

I might add checking again in the future, but you'll need to typecheck in
your head for now.

1 files changed, 5 insertions, 25 deletions

diff --git a/src/Helper.hs b/src/Helper.hs
index 9c3df50..a1333fb 100644
--- a/src/Helper.hs
+++ b/src/Helper.hs
@@ -39,13 +39,11 @@ printContext (Context inp path) = p $ lines inp
 
 errPrefix :: String
 errPrefix = "\ESC[101m\ESC[30mERROR\ESC[0m "
-data Error = SyntaxError String | UndefinedIdentifier Identifier | UnmatchedMixfix [MixfixIdentifierKind] [Mixfix] | InvalidIndex Int | FailedTest Expression Expression Expression Expression | ContextualError Error Context | SuggestSolution Error String | ImportError String | TypeError [Type]
+data Error = SyntaxError String | UndefinedIdentifier Identifier | UnmatchedMixfix [MixfixIdentifierKind] [Mixfix] | InvalidIndex Int | FailedTest Expression Expression Expression Expression | ContextualError Error Context | SuggestSolution Error String | ImportError String
 instance Show Error where
   show (ContextualError err ctx) = show err <> "\n" <> (printContext ctx)
   show (SuggestSolution err sol) =
-    show err
-      <> "\n\ESC[102m\ESC[30msuggestion\ESC[0m Perhaps you meant: "
-      <> sol
+    show err <> "\n\ESC[102m\ESC[30msuggestion\ESC[0m Perhaps you meant " <> sol
   show (SyntaxError err) =
     errPrefix <> "invalid syntax\n\ESC[105m\ESC[30mnear\ESC[0m " <> err
   show (UndefinedIdentifier ident) =
@@ -68,8 +66,6 @@ instance Show Error where
       <> " = "
       <> show red2
   show (ImportError path) = errPrefix <> "invalid import " <> show path
-  show (TypeError ts) =
-    errPrefix <> "couldn't match types " <> intercalate " and " (map show ts)
 type Failable = Either Error
 
 -- Modified from megaparsec's errorBundlePretty
@@ -128,7 +124,7 @@ instance Show Mixfix where
   show (MixfixOperator   i) = show i
   show (MixfixExpression e) = show e
 -- TODO: Remove Application and replace with Chain (renaming of MixfixChain)
-data Expression = Bruijn Int | Function Identifier | Abstraction Expression | Application Expression Expression | MixfixChain [Mixfix] | Prefix Identifier Expression | TypedExpression Type Expression
+data Expression = Bruijn Int | Function Identifier | Abstraction Expression | Application Expression Expression | MixfixChain [Mixfix] | Prefix Identifier Expression
   deriving (Ord, Eq)
 instance Show Expression where
   show (Bruijn      x    ) = "\ESC[91m" <> show x <> "\ESC[0m"
@@ -138,25 +134,10 @@ instance Show Expression where
     "\ESC[33m(\ESC[0m" <> show exp1 <> " " <> show exp2 <> "\ESC[33m)\ESC[0m"
   show (MixfixChain ms) =
     "\ESC[33m(\ESC[0m" <> (intercalate " " $ map show ms) <> "\ESC[33m)\ESC[0m"
-  show (Prefix          p e) = show p <> " " <> show e
-  show (TypedExpression t e) = show e <> " ⧗ " <> show t
+  show (Prefix p e) = show p <> " " <> show e
 data Command = Input String | Import String String | Test Expression Expression
   deriving (Show)
-data Type = AnyType | PolymorphicType String | NormalType String | ConstructorType String [Type] | FunctionType [Type]
-  deriving (Ord, Eq)
-instance Show Type where
-  show AnyType             = "\ESC[33mAny\ESC[0m"
-  show (PolymorphicType n) = "\ESC[36m" <> n <> "\ESC[0m"
-  show (NormalType      n) = "\ESC[95m" <> n <> "\ESC[0m"
-  show (ConstructorType n ts) =
-    "("
-      <> "\ESC[95m"
-      <> n
-      <> "\ESC[0m"
-      <> (intercalate " " (map show ts))
-      <> ")"
-  show (FunctionType ts) = "(" <> (intercalate " → " (map show ts)) <> ")"
-data Instruction = Define Identifier Expression Type [Instruction] | Evaluate Expression | Comment | Commands [Command] | ContextualInstruction Instruction String
+data Instruction = Define Identifier Expression [Instruction] | Evaluate Expression | Comment | Commands [Command] | ContextualInstruction Instruction String
   deriving (Show)
 
 data EvalConf = EvalConf
@@ -171,7 +152,6 @@ data ExpFlags = ExpFlags
   deriving Show
 data EnvDef = EnvDef
   { _exp   :: Expression
-  , _type  :: Type
   , _sub   :: Environment
   , _flags :: ExpFlags
   }