Commit f55f09e

committed

simplified parsing a bit more

1 parent 964f33d commit f55f09eCopy full SHA for f55f09e

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import Control.Applicative (liftA2)`
`8`	`8`	`import Control.Monad (mfilter)`
`9`	`9`	`import Data.Char (isDigit)`
`10`	`10`	`import Data.Foldable (toList)`
	`11`	`+import Data.List.Split (splitOn)`
`11`	`12`	`import qualified Data.Map as M`
`12`	`13`	`import qualified Data.Set as S`
`13`	`14`	`import qualified Data.Vector as V`
`@@ -51,11 +52,9 @@ parse = (\case L.V3 r v a -> S r v a)`
`51`	`52`	`. V.fromList . lines`
`52`	`53`
`53`	`54`	`parseLine :: String -> L.V3 (L.V3 Int)`
`54`		`-parseLine (mapread.words.onlyNums->[pX,pY,pZ,vX,vY,vZ,aX,aY,aZ])`
	`55`	`+parseLine (map(read.filter numChar).splitOn","->[pX,pY,pZ,vX,vY,vZ,aX,aY,aZ])`
`55`	`56`	`= L.V3 (L.V3 pX pY pZ) (L.V3 vX vY vZ) (L.V3 aX aY aZ)`
`56`	`57`	`parseLine _ = error "No parse"`
`57`	`58`
`58`		`-onlyNums :: String -> String`
`59`		`-onlyNums = map $ \c -> if isDigit c \|\| c == '-'`
`60`		`- then c`
`61`		`- else ' '`
	`59`	`+numChar :: Char -> Bool`
	`60`	`+numChar c = isDigit c \|\| c == '-'`

Comments

(0)