Set bracket not in parser.

Author: Due

src/Alpacc/Encode.hs

@@ -320,7 +320,7 @@ hash =
 
 data LLPTable
   = LLPTable
-  { llpStacks :: [Bracket Integer],
+  { llpStacks :: [Integer],
     llpProductions :: [Int],
     llpOATable :: OpenAddressing [Integer] ((Int, Int), (Int, Int))
   }
@@ -337,10 +337,15 @@ llpHashTable ::
 llpHashTable q k empty_terminal grammar encoder = do
   table <- llpParserTableWithStartsHomomorphisms q k $ getGrammar grammar
 
+  num_bits <- fromInteger . numBits <$> bracketIntType encoder
   let int_table =
         Map.mapKeys (uncurry (<>)) $
           padLLPTableKeys empty_terminal q k $
             toIntLLPTable encoder table
-      (stacks, prods, flat_int_table) = flattenTuple int_table
+      (stacks', prods, flat_int_table) = flattenTuple int_table
+      stacks = map (bracketEncode num_bits) stacks'
       oa = openAdressing hash flat_int_table
   pure $ LLPTable stacks prods oa
+  where
+    bracketEncode nbs (LBracket a) = a `setBit` (nbs - 1)
+    bracketEncode _ (RBracket a) = a

src/Alpacc/Generator/Futhark/Parser.hs

@@ -7,9 +7,6 @@ import Alpacc.Encode
 import Alpacc.Generator.Analyzer
 import Alpacc.Generator.Futhark.Futharkify
 import Alpacc.HashTable
-import Alpacc.LLP
-  ( Bracket (..),
-  )
 import Alpacc.Types
 import Data.FileEmbed
 import Data.String.Interpolate (i)
@@ -19,10 +16,6 @@ import Data.Text qualified as Text
 futharkParser :: Text
 futharkParser = $(embedStringFile "futhark/parser.fut")
 
-futharkifyBracket :: (Futharkify a) => Bracket a -> RawString
-futharkifyBracket (LBracket a) = RawString . ("left " <>) $ futharkify a
-futharkifyBracket (RBracket a) = RawString . ("right " <>) $ futharkify a
-
 -- | Creates Futhark source code which contains a parallel parser that can
 -- create the productions list for a input which is indexes of terminals.
 generateParser :: UInt -> Parser -> Text
@@ -40,12 +33,6 @@ type terminal = terminal_module.t
 type production = production_module.t
 type bracket = bracket_module.t
 
-def left (s : bracket) : bracket =
-  bracket_module.set_bit (bracket_module.num_bits - 1) s 1
-
-def right (s : bracket) : bracket =
-  bracket_module.set_bit (bracket_module.num_bits - 1) s 0
-
 def number_of_productions: i64 = #{number_of_productions} 
 def q: i64 = #{q}
 def k: i64 = #{k}
@@ -81,7 +68,7 @@ def productions: [productions_size]production =
     empty_terminal = emptyTerminal parser
     hash_table = llpTable parser
     number_of_productions = numberOfProductions parser
-    stacks = futharkifyBracket <$> llpStacks hash_table
+    stacks = llpStacks hash_table
     productions = llpProductions hash_table
     stacks_size = length $ llpStacks hash_table
     productions_size = length $ llpProductions hash_table