Fixed language parser.

Signed-off-by: Pavel Kirilin <win10@list.ru>

src/CodeGenerator.hs

+module CodeGenerator where
+
+import Definitions
+
+data State = State {
+    parsed :: BrainBreakBlock,
+    unparsed :: BrainBreakBlock,
+    mainFunction :: String
+}
+

src/Definitions.hs

@@ -6,6 +6,7 @@ data BrainBreakOperation = Increment
     | MoveLeft
     | Read
     | Write
+    | Comment
     | Loop BrainBreakBlock
     deriving (Eq, Show)
 

src/Lexer.hs → src/LangParser.hs

-module Lexer where
+module LangParser where
 import Control.Applicative
 import Text.Trifecta
+import Data.Maybe (catMaybes)
 import Definitions
 import Text.Parser.Combinators
 import Text.Parser.Token
 import Data.Functor
 
+filterComments :: BrainBreakBlock -> BrainBreakBlock
+filterComments (Comment:ops) = [] ++ filterComments ops
+filterComments (Loop ops:otherCode) = Loop (filterComments ops) : filterComments otherCode
+filterComments (op:ops) = op : filterComments ops
+filterComments [] = []
+
+parseComments :: Parser BrainBreakOperation
+parseComments = satisfy (not . (`elem` "<+>-[],.")) $> Comment
+
+parseLoop :: Parser BrainBreakOperation
+parseLoop = do
+    expr <- brackets parseBrainBreak
+    pure $ Loop expr
+
 parseBrainBreak :: Parser BrainBreakBlock
 parseBrainBreak = many $ parseLeft
  <|> parseRight
@@ -14,13 +29,11 @@ parseBrainBreak = many $ parseLeft
  <|> parseRead
  <|> parseWrite
  <|> parseLoop
+ <|> parseComments
     where
         parseRead      = comma        $> Read
         parseWrite     = dot          $> Write
         parseLeft      = symbolic '<' $> MoveLeft
         parseRight     = symbolic '>' $> MoveRight
         parseIncrement = symbolic '+' $> Increment
-        parseDecrement = symbolic '-' $> Decrement
-        parseLoop      = do
+        parseDecrement = symbolic '-' $> Decrement
\ No newline at end of file
-            expr <- brackets parseBrainBreak
-            pure $ Loop expr

src/Lib.hs

 module Lib where
 
-import Lexer
+import LangParser
+import Definitions
 import Text.Trifecta
 
 parseLine :: String -> IO ()
 parseLine line = case parseString parseBrainBreak mempty line of
-                    Success code -> print $ show code
+                    Success code -> print $ show $ filterComments code
                     Failure info -> print $ _errDoc info