sugar 0.0.1 → 0.0.1.1

raw patch · 2 files changed

+7/−20 lines, 2 filesdep ~vector

Dependency ranges changed: vector

Files

src/Sugar/Parser.hs +4/−17
sugar.cabal +3/−3

src/Sugar/Parser.hs view

@@ -22,7 +22,7 @@  data Token   = Token'Unit TokenNote-  | Token'String String TokenNote+  | Token'Text String TokenNote   | Token'List [TokenStep] Wrap TokenNote   | Token'Map [(TokenStep,TokenStep)] TokenNote   deriving (Show, Eq)@@ -61,7 +61,7 @@ flatten :: TokenStep -> Sugar flatten (_, s) = case s of   Token'Unit note -> Sugar'Unit (fmap flatten <$> note)-  Token'String str note -> Sugar'Text (T.pack str) (fmap flatten <$> note)+  Token'Text str note -> Sugar'Text (T.pack str) (fmap flatten <$> note)   Token'List elems wrap note -> Sugar'List (flatten <$> elems) wrap (fmap flatten <$> note)   Token'Map elems note -> Sugar'Map ((\(x,y) -> (flatten x, flatten y)) <$> elems) (fmap flatten <$> note) @@ -175,7 +175,7 @@   s <- lexemeQuoteString   void $ lexeme Lexeme'QuoteEnd   note <- sugarParseNote-  let tkn = Token'String s note+  let tkn = Token'Text s note   pure (sl, tkn)  sugarParseText :: Parser TokenStep@@ -183,7 +183,7 @@   (sl, _) <- lexeme Lexeme'StringStart   s <- lexemeString   note <- sugarParseNote-  let tkn = Token'String s note+  let tkn = Token'Text s note   pure (sl, tkn)  lexemeQuoteString :: Parser String@@ -227,16 +227,3 @@ try p = Parser $ \ts -> case runParser p ts of   (_, Left a) -> (ts, Left a)   (ts', Right b)  -> (ts', Right b)--{--parseError :: String -> String -> Parser a-parseError descr tag = Parser $ \ts -> case ts of-    [] -> (ts, Left $ (Nothing, msg))-    ((loc,_):_) -> (ts, Left $ (Just loc, msg))-  where-    msg = tag ++ ": " ++ descr--choice :: String -> [Parser a] -> Parser a-choice description = foldr (<|>) noMatch-  where noMatch = parseError description "no match"--}

sugar.cabal view

@@ -1,6 +1,6 @@ name: sugar-version: 0.0.1-synopsis: A general purpose data language for humans.+version: 0.0.1.1+synopsis: A pretty, sweet data language homepage: https://github.com/jxv/sugar#readme description: Alternative to: JSON, YAML, TOML, et cetera. Please see the README on GitHub at <https://github.com/jxv/sugar#readme> category: Text, Configuration@@ -43,7 +43,7 @@     , text     , text-conversions     , unordered-containers-    , vector+    , vector <0.13   default-language: Haskell2010  test-suite sugar-tests