Factored out lexer and parser, added high level API modules.

Updated bindings generator. Moved to /opt/arrayfire includes
and lib dirs. Renaming of package.

Author: dmjio

.gitignore

@@ -3,3 +3,4 @@ result/
 /TAGS
 /result
 *~
+/ctags

fire.cabal arrayfire.cabalfire.cabal renamed to arrayfire.cabal

@@ -1,4 +1,4 @@
-name:                fire
+name:                arrayfire
 version:             0.1.0.0
 synopsis:            Haskell bindings to ArrayFire
 description:         High-level Haskell bindings to ArrayFire
@@ -15,35 +15,55 @@ cabal-version:       >=1.10
 
 library
   exposed-modules:
+    ArrayFire.Arith
+    ArrayFire.Array
+    ArrayFire.Backend
+    ArrayFire.BLAS
+    ArrayFire.Data
+    ArrayFire.Device
+    ArrayFire.Exception
+    ArrayFire.Graphics
+    ArrayFire.LAPACK
+    ArrayFire.Random
+    ArrayFire.Statistics
+    ArrayFire.Util
     ArrayFire.Internal.Algorithm
     ArrayFire.Internal.Arith
     ArrayFire.Internal.Array
     ArrayFire.Internal.Backend
     ArrayFire.Internal.BLAS
-    ArrayFire.Internal.Complex
-    ArrayFire.Internal.CUDA
+--  ArrayFire.Internal.CUDA
     ArrayFire.Internal.Data
     ArrayFire.Internal.Defines
     ArrayFire.Internal.Device
     ArrayFire.Internal.Exception
     ArrayFire.Internal.Features
     ArrayFire.Internal.Graphics
-    ArrayFire.Internal.Images
+    ArrayFire.Internal.Image
     ArrayFire.Internal.Index
     ArrayFire.Internal.Internal
     ArrayFire.Internal.LAPACK
-    ArrayFire.Internal.OpenCL
+--  ArrayFire.Internal.OpenCL
     ArrayFire.Internal.Random
-    ArrayFire.Internal.Seq
+--    ArrayFire.Internal.Seq
     ArrayFire.Internal.Signal
     ArrayFire.Internal.Sparse
     ArrayFire.Internal.Statistics
+    ArrayFire.Internal.Types
     ArrayFire.Internal.Util
     ArrayFire.Internal.Vision
   build-tools:
     hsc2hs
   include-dirs:
-    include
+    /opt/arrayfire/include
+  extra-lib-dirs:
+    /opt/arrayfire/lib
+  ld-options:
+    -rpath /opt/arrayfire/lib
+  cc-options:
+    -fPIC
+  extra-libraries:
+    af
   build-depends:
     base < 5
   hs-source-dirs:
@@ -57,7 +77,7 @@ executable main
   main-is:
     Main.hs
   build-depends:
-    base < 5, fire
+    base < 5, arrayfire
   default-language:
     Haskell2010
 
@@ -70,3 +90,8 @@ executable gen
     base < 5, parsec, text, directory
   default-language:
     Haskell2010
+  other-modules:
+    Lex
+    Parse
+    Print
+    Types

default.nix

@@ -1 +1,2 @@
-{ pkgs ? import <nixpkgs> {} }: pkgs.haskellPackages.callPackage ./pkg.nix {}
+{ pkgs ? import <nixpkgs> {} }:
+pkgs.haskellPackages.callPackage ./pkg.nix {}

exe/Main.hs

@@ -1,3 +1,53 @@
 module Main where
 
-main = print 4
+import Control.Concurrent
+
+import ArrayFire.Internal.Defines
+
+import ArrayFire.Util
+import ArrayFire.Exception
+import ArrayFire.Device
+import ArrayFire.Data
+import ArrayFire.Arith
+import ArrayFire.Array
+import ArrayFire.LAPACK
+import ArrayFire.Backend
+import ArrayFire.Statistics
+import ArrayFire.Random
+import ArrayFire.Graphics
+import ArrayFire.BLAS
+
+main :: IO ()
+main = do
+  -- Info things
+  -- print =<< getVersion
+  -- getInfo
+  -- print =<< errorToString afErrNoMem
+  -- putStrLn =<< getInfoString
+  -- print =<< getDeviceCount
+  -- print =<< getDevice
+  -- print =<< getRevision
+
+  -- -- Create and print an array
+  -- arr1 <- constant 1 1 1 f64
+  -- arr2 <- constant 2 1 1 f64
+  -- r <- addArray arr1 arr2 True
+  -- printArray r
+
+  -- print =<< isLAPACKAvailable
+  -- print =<< getActiveBackend
+
+  -- w <- createWindow 300 300 "hey"
+  -- showWindow w
+  -- threadDelay (secs 10)
+
+  a1 <- randn 1 1 1 f64
+  a2 <- randn 1 1 1 f64
+  a3 <- matmul a1 a2 afMatNone afMatNone
+  printArray a3
+
+  -- x <- constant 10 1 1 f64
+  -- printArray =<< mean x 0
+
+secs :: Int -> Int
+secs = (*1000000)

gen/Lex.hs

@@ -0,0 +1,39 @@
+{-# LANGUAGE OverloadedStrings #-}
+module Lex where
+
+import           Control.Arrow
+import           Data.Text (Text)
+import qualified Data.Text as T
+
+import           Data.Char
+import           Types
+
+symbols :: String
+symbols = " *();,"
+
+lex :: Text -> [Token]
+lex = go NameMode
+  where
+    tokenize ' ' = []
+    tokenize '*' = [Star]
+    tokenize '(' = [LParen]
+    tokenize ')' = [RParen]
+    tokenize ';' = [Semi]
+    tokenize ',' = [Comma]
+    tokenize _ = []
+    go TokenMode xs = do
+      case T.uncons xs of
+        Nothing -> []
+        Just (c,cs)
+          | isAlpha c -> go NameMode (T.cons c cs)
+          | otherwise -> tokenize c ++ go TokenMode cs
+    go NameMode xs = do
+      let (match, rest) = partition xs
+      if match == "const"
+        then [] ++ go TokenMode rest
+        else Id match : go TokenMode rest
+
+partition :: Text -> (Text,Text)
+partition =
+  T.takeWhile (`notElem` symbols) &&&
+    T.dropWhile (`notElem` symbols)