Skip to content
Browse files

Merge branch 'base' into develop

  • Loading branch information...
2 parents 2f71414 + 5354fb4 commit 340ec43f52a1c45031629017ab62ba79bf7da5ed @Laar committed Mar 13, 2013
View
3 .gitmodules
@@ -4,3 +4,6 @@
[submodule "opengl-api"]
path = opengl-api
url = git://github.com/Laar/opengl-api.git
+[submodule "OpenGLRawgenBase"]
+ path = OpenGLRawgenBase
+ url = git@github.com:Laar/OpenGLRawgenBase.git
View
3 OpenGLRawgen.cabal
@@ -42,7 +42,8 @@ executable OpenGLRawgen
mtl -any,
opengl-api -any,
parsec -any,
- xml
+ xml,
+ OpenGLRawgenBase
ghc-options: -Wall -O2 -rtsopts
ghc-shared-options:
ghc-prof-options: -Wall -O2 -rtsopts -prof -auto-all -caf-all
1 OpenGLRawgenBase
@@ -0,0 +1 @@
+Subproject commit ab05c18f89ae041afb16ecba665dbc9d2bf9cd6e
View
2 src/Code/ModuleCode.hs
@@ -24,7 +24,7 @@ import Data.Maybe
import Data.Traversable(traverse)
import Language.Haskell.Exts.Syntax
-import Text.OpenGL.Spec(Category, showCategory)
+import Language.OpenGLRaw.Base
import Code.Generating.Utils
View
1 src/Modules/Builder.hs
@@ -58,7 +58,6 @@ import Control.Monad.Writer
import Language.Haskell.Exts.Syntax
-import Text.OpenGL.Spec as S
import Spec
import Main.Monad
View
3 src/Modules/Compatibility.hs
@@ -18,9 +18,8 @@ module Modules.Compatibility (
-----------------------------------------------------------------------------
-import Text.OpenGL.Spec(Category(Version))
-
import Language.Haskell.Exts.Syntax
+import Language.OpenGLRaw.Base
import Modules.Builder
import Modules.GroupModule
View
2 src/Modules/GroupModule.hs
@@ -27,7 +27,7 @@ import Control.Monad.Reader
import Data.Maybe(mapMaybe)
import Data.List(nub)
-import Text.OpenGL.Spec(Category(..), Extension)
+import Language.OpenGLRaw.Base
import Modules.Builder
import Modules.ModuleNames
View
4 src/Modules/ModuleNames.hs
@@ -44,7 +44,7 @@ import Data.List(partition)
import Language.Haskell.Exts.Syntax
import Code.Generating.Utils
-import Text.OpenGL.Spec as S
+import Language.OpenGLRaw.Base
import Main.Monad
-----------------------------------------------------------------------------
@@ -110,7 +110,7 @@ categoryModule (Extension ex n d) = return .
ModuleName
$ moduleBase <.> upperFirst (show ex) <.> correctName n
++ (if d then "Compatibility" else "")
-categoryModule (S.Name n) = throwRawError
+categoryModule (Name n) = throwRawError
$ "categoryModule: Category with only a name "
++ upperFirst (show n)
View
2 src/Modules/Raw.hs
@@ -26,7 +26,7 @@ import Data.List(minimumBy)
import Main.Options
import Spec
-import Text.OpenGL.Spec(Category(..))
+import Language.OpenGLRaw.Base
import Modules.Builder
import Modules.Compatibility
View
7 src/Modules/Types.hs
@@ -23,8 +23,8 @@ module Modules.Types (
import Language.Haskell.Exts.Syntax
-import Spec(ValueType(..), FType(..))
-import Text.OpenGL.Spec (Category)
+import Spec(ValueType(..))
+import Language.OpenGLRaw.Base
-----------------------------------------------------------------------------
@@ -64,8 +64,5 @@ data ModulePart
-- | An imported name with specific module.
type Imported = (Name, ModuleName)
--- | The original name of something from OpenGL (thus the name as used in the
--- specification).
-type GLName = String
-----------------------------------------------------------------------------
View
2 src/Spec/Processing.hs
@@ -22,7 +22,7 @@ module Spec.Processing (
import Data.Monoid
import qualified Data.Set as S
-import Text.OpenGL.Spec(Category(Extension), Extension)
+import Language.OpenGLRaw.Base
import Main.Options
View
13 src/Spec/RawSpec.hs
@@ -60,7 +60,7 @@ import qualified Data.Set as S
import Data.Maybe
import Language.Haskell.Exts.Syntax(Name(Ident))
-import Text.OpenGL.Spec (Category)
+import Language.OpenGLRaw.Base
import Main.Options
@@ -78,13 +78,6 @@ data EnumValue
| ReUse EnumName ValueType
deriving (Eq, Ord, Show)
-data FType
- = TCon String
- | TVar
- | TPtr FType
- | UnitTCon
- deriving (Eq, Ord, Show)
-
-- | The specification of how the function is defined
data FuncValue
= RawFunc
@@ -93,10 +86,6 @@ data FuncValue
(Maybe String) -- ^ The possible alias.
deriving (Eq, Ord, Show)
--- | The original name of something from OpenGL (thus the name as used in the
--- specification).
-type GLName = String
-
-----------------------------------------------------------------------------

0 comments on commit 340ec43

Please sign in to comment.
Something went wrong with that request. Please try again.