Generated GF and GFC lexers with BNFC with string sharing support.

1 files changed, 21 insertions, 19 deletions

diff --git a/src/GF/Canon/LexGFC.x b/src/GF/Canon/LexGFC.x
index b3332a48b..d1dfaa1b4 100644
--- a/src/GF/Canon/LexGFC.x
+++ b/src/GF/Canon/LexGFC.x
@@ -1,10 +1,10 @@
 -- -*- haskell -*-
 -- This Alex file was machine-generated by the BNF converter
--- Lines with -- H have been hacked for greater performance
 {
 module LexGFC where
-import SharedString -- H
+
 import ErrM
+import SharedString
 }
 
 
@@ -21,25 +21,28 @@ $u = [\0-\255]          -- universal: any character
 :-
 
 $white+ ;
-@rsyms { tok (\p s -> PT p (TS $ shareString s)) }
+@rsyms { tok (\p s -> PT p (TS $ share s)) }
 
-$l $i*   { tok (\p s -> PT p (eitherResIdent (TV . shareString) s)) } -- H
-\" ([$u # [\" \\ \n]] | (\\ (\" | \\ | \' | n | t)))* \"{ tok (\p s -> PT p (TL $ shareString $ unescapeInitTail s)) } -- H
+$l $i*   { tok (\p s -> PT p (eitherResIdent (TV . share) s)) }
+\" ([$u # [\" \\ \n]] | (\\ (\" | \\ | \' | n | t)))* \"{ tok (\p s -> PT p (TL $ share $ unescapeInitTail s)) }
 
-$d+      { tok (\p s -> PT p (TI s))    }
+$d+      { tok (\p s -> PT p (TI $ share s))    }
 
 
 {
 
 tok f p s = f p s
 
+share :: String -> String
+share = shareString
+
 data Tok =
-   TS !String     -- reserved words  -- H
- | TL !String     -- string literals -- H
- | TI String     -- integer literals
- | TV !String     -- identifiers     -- H
- | TD String     -- double precision float literals
- | TC String     -- character literals
+   TS !String     -- reserved words
+ | TL !String     -- string literals
+ | TI !String     -- integer literals
+ | TV !String     -- identifiers
+ | TD !String     -- double precision float literals
+ | TC !String     -- character literals
 
  deriving (Eq,Show,Ord)
 
@@ -68,15 +71,14 @@ data BTree = N | B String Tok BTree BTree deriving (Show)
 
 eitherResIdent :: (String -> Tok) -> String -> Tok
 eitherResIdent tv s = treeFind resWords
-    where 
-    treeFind N = tv s
-    treeFind (B a t left right) | s < a  = treeFind left
-				| s > a  = treeFind right
-				| s == a = t
+  where
+  treeFind N = tv s
+  treeFind (B a t left right) | s < a  = treeFind left
+                              | s > a  = treeFind right
+                              | s == a = t
 
 resWords = b "lin" (b "concrete" (b "Type" (b "Str" (b "Ints" N N) N) (b "cat" (b "abstract" N N) N)) (b "fun" (b "flags" (b "data" N N) N) (b "in" (b "grammar" N N) N))) (b "pre" (b "open" (b "of" (b "lincat" N N) N) (b "param" (b "oper" N N) N)) (b "transfer" (b "table" (b "resource" N N) N) (b "variants" N N)))
-      where b s = B s (TS s)
-
+   where b s = B s (TS s)
 
 unescapeInitTail :: String -> String
 unescapeInitTail = unesc . tail where