diff --git a/src/GF/Source/LexGF.hs b/src/GF/Source/LexGF.hs index 316da3afd..c45e03f78 100644 --- a/src/GF/Source/LexGF.hs +++ b/src/GF/Source/LexGF.hs @@ -4,7 +4,7 @@ {-# OPTIONS -fno-warn-incomplete-patterns #-} module GF.Source.LexGF where -import GF.Source.SharedString + import qualified Data.ByteString.Char8 as BS #if __GLASGOW_HASKELL__ >= 603 @@ -44,7 +44,7 @@ alex_accept = listArray (0::Int,34) [[],[],[(AlexAccSkip)],[(AlexAccSkip)],[],[( tok f p s = f p s share :: BS.ByteString -> BS.ByteString -share = shareString +share = id data Tok = TS !BS.ByteString !Int -- reserved words and symbols diff --git a/src/GF/Source/LexGF.x b/src/GF/Source/LexGF.x index 46419df74..3579d0cd8 100644 --- a/src/GF/Source/LexGF.x +++ b/src/GF/Source/LexGF.x @@ -4,7 +4,7 @@ {-# OPTIONS -fno-warn-incomplete-patterns #-} module GF.Source.LexGF where -import GF.Source.SharedString + import qualified Data.ByteString.Char8 as BS } @@ -39,7 +39,7 @@ $d+ \. $d+ (e (\-)? $d+)? { tok (\p s -> PT p (TD $ share s)) } tok f p s = f p s share :: BS.ByteString -> BS.ByteString -share = shareString +share = id data Tok = TS !BS.ByteString !Int -- reserved words and symbols diff --git a/src/GF/Source/Makefile b/src/GF/Source/Makefile index a07f78ba5..082efa5ef 100644 --- a/src/GF/Source/Makefile +++ b/src/GF/Source/Makefile @@ -1,5 +1,5 @@ all: - cd ../.. && bnfc -p GF.Source -bytestrings -sharestrings GF/Source/GF.cf + cd ../.. && bnfc -p GF.Source -bytestrings GF/Source/GF.cf rm ErrM.hs perl -i -pe 's/%name pModHeader ModHeader/%partial pModHeader ModHeader/' ParGF.y perl -i -pe 's/GF.Source.ErrM/GF.Data.ErrM/' *.hs *.x *.y