Merge content store

src/Parser.hs

@@ -249,7 +249,7 @@ parseGroupedItemM = do
 parseSingleItemM :: ParserM TricuAST
 parseSingleItemM = do
   token <- satisfyM (\case LIdentifier _ -> True; LKeywordT -> True; _ -> False)
-  if | LIdentifier name <- token -> pure (SVar name)
+  if | LIdentifier name <- token -> pure (SVar name Nothing)
      | token == LKeywordT        -> pure TLeaf
      | otherwise                 -> fail "Unexpected token in list item"
 
@@ -258,16 +258,25 @@ parseVarM = do
   token <- satisfyM (\case
     LNamespace _ -> True
     LIdentifier _ -> True
+    LIdentifierWithHash _ _ -> True
     _ -> False)
+
   case token of
     LNamespace ns -> do
       _ <- satisfyM (== LDot)
       LIdentifier name <- satisfyM (\case LIdentifier _ -> True; _ -> False)
-      pure $ SVar (ns ++ "." ++ name)
+      pure $ SVar (ns ++ "." ++ name) Nothing
+
     LIdentifier name
       | name == "t" || name == "!result" ->
         fail ("Reserved keyword: " ++ name ++ " cannot be assigned.")
-      | otherwise -> pure (SVar name)
+      | otherwise -> pure (SVar name Nothing)
+
+    LIdentifierWithHash name hash ->
+      if name == "t" || name == "!result"
+        then fail ("Reserved keyword: " ++ name ++ " cannot be assigned.")
+        else pure (SVar name (Just hash))
+
     _ -> fail "Unexpected token while parsing variable"
 
 parseIntLiteralM :: ParserM TricuAST
@@ -275,7 +284,7 @@ parseIntLiteralM = do
   let intL = (\case LIntegerLiteral _ -> True; _ -> False)
   token <- satisfyM intL
   if | LIntegerLiteral value <- token ->
-       pure (SInt value)
+       pure (SInt (fromIntegral value))
      | otherwise                      ->
        fail "Unexpected token while parsing integer literal"