[gentoo-commits] gentoo-x86 commit in dev-haskell/alex/files: alex-2.3.5-missing-test.patch alex-2.3.5-ghc-7.2.patch

[Sergei Trofimovich (slyfox)]

slyfox      11/07/31 15:38:07

  Added:                alex-2.3.5-missing-test.patch
                        alex-2.3.5-ghc-7.2.patch
  Log:
  Version bump. Added tests support.
  
  (Portage version: 2.1.10.7/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-haskell/alex/files/alex-2.3.5-missing-test.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/alex/files/alex-2.3.5-missing-test.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/alex/files/alex-2.3.5-missing-test.patch?rev=1.1&content-type=text/plain

Index: alex-2.3.5-missing-test.patch
===================================================================
commit 883587ca4feecab72381991533b2f686a57a4d57
Author: Sergei Trofimovich <slyfox@g.o>
Date:   Mon Jul 25 08:20:13 2011 +0300

    added missing tokens_bytestring test
    
    Signed-off-by: Sergei Trofimovich <slyfox@g.o>

diff --git a/alex.cabal b/alex.cabal
index b262af7..c6f6e22 100644
--- a/alex.cabal
+++ b/alex.cabal
@@ -57,6 +57,7 @@ extra-source-files:
 	tests/tokens.x
 	tests/tokens_gscan.x
 	tests/tokens_posn.x
+	tests/tokens_bytestring.x
 
 flag small_base
   description: Choose the new smaller, split-up base package.
diff --git a/tests/tokens_bytestring.x b/tests/tokens_bytestring.x
new file mode 100644
index 0000000..0cb23c8
--- /dev/null
+++ b/tests/tokens_bytestring.x
@@ -0,0 +1,46 @@
+{
+{-# LANGUAGE OverloadedStrings #-}
+module Main (main) where
+import System.Exit
+import Data.ByteString.Lazy.Char8 (unpack)
+}
+
+%wrapper "posn-bytestring"
+
+$digit = 0-9			-- digits
+$alpha = [a-zA-Z]		-- alphabetic characters
+
+tokens :-
+
+  $white+				;
+  "--".*				;
+  let					{ tok (\p s -> Let p) }
+  in					{ tok (\p s -> In p) }
+  $digit+                               { tok (\p s -> Int p (read (unpack s))) }
+  [\=\+\-\*\/\(\)]                      { tok (\p s -> Sym p (head (unpack s))) }
+  $alpha [$alpha $digit \_ \']*         { tok (\p s -> Var p (unpack s)) }
+
+{
+-- Each right-hand side has type :: AlexPosn -> String -> Token
+
+-- Some action helpers:
+tok f p s = f p s
+
+-- The token type:
+data Token =
+	Let AlexPosn		|
+	In  AlexPosn		|
+	Sym AlexPosn Char	|
+        Var AlexPosn String     |
+	Int AlexPosn Int	|
+	Err AlexPosn
+	deriving (Eq,Show)
+
+main = if test1 /= result1 then exitFailure
+			   else exitWith ExitSuccess
+
+test1 = alexScanTokens "  let in 012334\n=+*foo bar__'"
+result1 = [Let (AlexPn 2 1 3),In (AlexPn 6 1 7),Int (AlexPn 9 1 10) 12334,Sym (AlexPn 16 2 1) '=',Sym (AlexPn 17 2 2) '+',Sym (AlexPn 18 2 3) '*',Var (AlexPn 19 2 4) "foo",Var (AlexPn 23 2 8) "bar__'"]
+
+
+}



1.1                  dev-haskell/alex/files/alex-2.3.5-ghc-7.2.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/alex/files/alex-2.3.5-ghc-7.2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/alex/files/alex-2.3.5-ghc-7.2.patch?rev=1.1&content-type=text/plain

Index: alex-2.3.5-ghc-7.2.patch
===================================================================
diff --git a/alex.cabal b/alex.cabal
index d04467b..b262af7 100644
--- a/alex.cabal
+++ b/alex.cabal
@@ -72,7 +72,7 @@ executable alex
 
   build-depends: base < 5
 
-  extensions: CPP
+  extensions: CPP, BangPatterns
   ghc-options: -Wall
   other-modules:
         AbsSyn
diff --git a/doc/configure.ac b/doc/configure.ac
index 51fa85d..6e772c0 100644
--- a/doc/configure.ac
+++ b/doc/configure.ac
@@ -9,5 +9,5 @@ FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/
 
 AC_PATH_PROG(DbLatexCmd,dblatex)
 
-AC_CONFIG_FILES([config.mk])
+AC_CONFIG_FILES([config.mk alex.1])
 AC_OUTPUT