cakyrespa 0.0.7 → 0.0.8

raw patch · 3 files changed

+16/−4 lines, 3 filesdep ~gluturtle

Dependency ranges changed: gluturtle

Files

• cakyrespa.cabal +2/−2
• src/Language/Lojban/Read.hs +2/−0
• src/cakyrespa.hs +12/−2

@@ -2,7 +2,7 @@ cabal-version:	>= 1.6  name:		cakyrespa-version:	0.0.7+version:	0.0.8 stability:	Alpha license:	BSD3 license-file:	LICENSE@@ -26,5 +26,5 @@     main-is:		cakyrespa.hs     other-modules:	Language.Lojban.Read     build-depends:	base >3 && <5, lojbanParser >= 0.1.5,-        gluturtle >= 0.0.10, GLUT, yjsvg+        gluturtle >= 0.0.13, GLUT, yjsvg     ghc-options:	-Wall

@@ -42,6 +42,7 @@ 	| KU 	| SFIhO Selbri Sumti 	| ZOI String+	| TUhA Sumti 	| NotImplementedSumti String 	deriving (Show, Eq) @@ -148,6 +149,7 @@ readSumti (TagSumti (P.FIhO (_, "fi'o", _) _ selbri _ _) sumti) = 	SFIhO (readSelbri selbri) (readSumti sumti) readSumti (P.ZOI _ "zoi" ws _ _) = ZOI $ processZOI $ concat ws+readSumti (P.LAhE_NAhE (_, "tu'a", _) _ _ _ s _ _) = TUhA $ readSumti s readSumti s = NotImplementedSumti $ "readSumti: " ++ show s  processZOI :: String -> String

@@ -16,8 +16,8 @@ 	_args <- initialize prgName rawArgs 	f <- openField "cakyrespa" 640 480 	t <- newTurtle f-	pencolor t ((255, 255, 255) :: (Int, Int, Int))-	fillcolor t ((255, 255, 255) :: (Int, Int, Int))+--	pencolor t ((255, 255, 255) :: (Int, Int, Int))+--	fillcolor t ((255, 255, 255) :: (Int, Int, Int)) 	shape t "turtle" 	shapesize t 3 3 	oninputtext f (processInput f t . cmd)@@ -29,6 +29,7 @@ pcmd p = case p of 	(Vocative "co'o") -> COhO 	(TenseGI "ba" b c) -> Commands (pcmd b) (pcmd c)+	b@(Bridi (Brivla "galfi") s) -> fromMaybe (Unknown b) $ readGalfi s 	b@(Bridi (Brivla "tcidu") s) -> fromMaybe (Unknown b) $ readTcidu s 	b@(Bridi (Brivla "rejgau") s) -> fromMaybe (Unknown b) $ readRejgau s 	b@(Bridi (Brivla "viska") s) -> fromMaybe (Unknown b) $ readViska s@@ -45,6 +46,13 @@ 	b@(Bridi (Brivla "clugau") s) -> fromMaybe (Unknown b) $ readClugau s 	r -> Unknown r +readGalfi s = do+	TUhA (KOhA "ko") <- lookup (FA 1) s+	LO (Brivla "foldi") Nothing <- lookup (FA 2) s+	LO (Brivla skari) Nothing <- lookup (FA 3) s+	clr <- lookup skari skaste+	return $ let (r, g, b) = clr in FLOSKA r g b+ readTcidu s = do 	KOhA "ko" <- lookup (FA 1) s 	LA (Right (ME (ZOI fp))) <- lookup (FA 3) s@@ -192,6 +200,7 @@ 	| PEBYCISNI Double 	| PEBYSKA Int Int Int 	| BURSKA Int Int Int+	| FLOSKA Int Int Int 	| COhACLUGAU 	| COhUCLUGAU 	| Commands Command Command@@ -219,6 +228,7 @@ processInput _ t (PEBYCISNI s) = pensize t s >> return True processInput _ t (PEBYSKA r g b) = pencolor t (r, g, b) >> return True processInput _ t (BURSKA r g b) = fillcolor t (r, g, b) >> return True+processInput _ t (FLOSKA r g b) = bgcolor t (r, g, b) >> return True processInput _ t COhACLUGAU = beginfill t >> return True processInput _ t COhUCLUGAU = endfill t >> return True processInput _ t XRUTI = undo t >> return True