HRay 1.2.1 → 1.2.2

raw patch · 4 files changed

+16/−20 lines, 4 filesdep +happy

Dependencies added: happy

Files

• HRay.cabal +2/−2
• HRay.cabal~ +2/−2
• HRayParser.hs +6/−8
• HRayParser.y +6/−8

@@ -1,5 +1,5 @@ name:                HRay-version:             1.2.1+version:             1.2.2 synopsis:            Haskell raytracer description:         HRay is a ray tracing application written in Haskell as part of my                      masters thesis at Ghent University. @@ -15,7 +15,7 @@ maintainer:          boegel <kenneth [dot] hoste [at] [dot] ugent [dot] be> homepage:            http://boegel.kejo.be/ELIS/Haskell/HRay/ -build-depends:       base>3 && <5, array, directory, haskell98+build-depends:       base>3 && <5, array, directory, haskell98, happy build-type:          Simple data-files:          readme.txt,                      -- and some files to experiment with

@@ -1,5 +1,5 @@ name:                HRay-version:             1.2.0+version:             1.2.2 synopsis:            Haskell raytracer description:         HRay is a ray tracing application written in Haskell as part of my                      masters thesis at Ghent University. @@ -15,7 +15,7 @@ maintainer:          boegel <kenneth [dot] hoste [at] [dot] ugent [dot] be> homepage:            http://boegel.kejo.be/ELIS/Haskell/HRay/ -build-depends:       base>3 && <5, array, directory+build-depends:       base>3 && <5, array, directory, haskell98, happy build-type:          Simple data-files:          readme.txt,                      -- and some files to experiment with

@@ -16,14 +16,6 @@ import HRayMath (Dimension, Resolution, Object(Sphere,Plane,Meta), MetaPoint(MetaPoint)) import Char (isSpace, isAlpha, isDigit) ---- representation of a full description of scene which should be rendered-data RenderDescr = RenderDescr Resolution Int Scene---readDescr :: String -> RenderDescr-readDescr = parseScene.lexer- -- parser produced by Happy Version 1.18.5  data HappyAbsSyn t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18@@ -1282,6 +1274,12 @@  happySeq = happyDontSeq ++-- representation of a full description of scene which should be rendered+data RenderDescr = RenderDescr Resolution Int Scene++readDescr :: String -> RenderDescr+readDescr = parseScene.lexer  happyError :: [Token] -> a happyError _ = error "Parse error ! ! !"

@@ -16,14 +16,6 @@ import HRayMath (Dimension, Resolution, Object(Sphere,Plane,Meta), MetaPoint(MetaPoint)) import Char (isSpace, isAlpha, isDigit) ---- representation of a full description of scene which should be rendered-data RenderDescr = RenderDescr Resolution Int Scene---readDescr :: String -> RenderDescr-readDescr = parseScene.lexer- }  %name parseScene@@ -125,6 +117,12 @@             | Lights Light                                                     { $2 : $1 }  {++-- representation of a full description of scene which should be rendered+data RenderDescr = RenderDescr Resolution Int Scene++readDescr :: String -> RenderDescr+readDescr = parseScene.lexer  happyError :: [Token] -> a happyError _ = error "Parse error ! ! !"