Merge pull request #4 from joaoSaraiva/master

Changed import of Prelude in RegExpParser.hs
haslab · Sep 5, 2016 · fb12539 · fb12539
2 parents 0c3cdf0 + 4932d90
commit fb12539
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/HaLeX.cabal b/HaLeX.cabal
@@ -1,5 +1,5 @@
 name:                HaLeX
-version:             1.2.1
+version:             1.2.2
 synopsis:            HaLeX enables modelling, manipulation and animation of regular languages
 description:         This library was developed in the context of a programming methodology course for
                      undergraduate students, and as a consequence, it was defined mainly for educational purposes.

diff --git a/HaLeX_lib/Language/HaLex/RegExpParser.hs b/HaLeX_lib/Language/HaLex/RegExpParser.hs
@@ -21,6 +21,7 @@
 module Language.HaLex.RegExpParser ( parseRegExp
                                    ) where
 
+import Prelude hiding ((<$>), (<*>))
 import Data.Char
 import Language.HaLex.Parser
 import Language.HaLex.RegExp

diff --git a/INSTALL b/INSTALL
@@ -12,7 +12,7 @@ copyright Jo
           [email protected]
 
 
-Version: 1.1 (January, 2005)
+Version: 1.2.2 (August, 2016)
 
 
 - halex batch tool

diff --git a/LICENSE b/LICENSE
@@ -2,4 +2,4 @@ From <http://www.di.uminho.pt/~jas/Research/HaLeX/HaLeX.html>:
 
 "6- Where to get the software
 
-The HaLeX system is public domain and it is available as a gzipped tar file at: HaLeX_1.2.1.tgz"
+The HaLeX system is public domain and it is available as a gzipped tar file at: HaLeX_1.2.2.tgz"
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ Copyright João Saraiva
           [email protected]
 
 
-Version: 1.2.1 (October, 2013)
+Version: 1.2.2 (August, 2016)
 
 
 1- What is HaleX
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ From <http://www.di.uminho.pt/~jas/Research/HaLeX/HaLeX.html>:

		"6- Where to get the software

		The HaLeX system is public domain and it is available as a gzipped tar file at: HaLeX_1.2.1.tgz"
		The HaLeX system is public domain and it is available as a gzipped tar file at: HaLeX_1.2.2.tgz"