Cleaned tree for rewrite

7 files changed, 0 insertions, 352 deletions

diff --git a/bbcode/LICENSE b/bbcode/LICENSE
deleted file mode 100644
index 4ad71e2..0000000
--- a/bbcode/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an "owner") of an original work of authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for the purpose of contributing to a commons of creative, cultural and scientific works ("Commons") that the public can reliably and without fear of later claims of infringement build upon, modify, incorporate in other works, reuse and redistribute as freely as possible in any form whatsoever and for any purposes, including without limitation commercial purposes. These owners may contribute to the Commons to promote the ideal of a free culture and the further production of creative, cultural and scientific works, or to gain reputation or greater distribution for their Work in part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any expectation of additional consideration or compensation, the person associating CC0 with a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and publicly distribute the Work under its terms, with knowledge of his or her Copyright and Related Rights in the Work and the meaning and intended legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be protected by copyright and related or neighboring rights ("Copyright and Related Rights"). Copyright and Related Rights include, but are not limited to, the following:
-
-the right to reproduce, adapt, distribute, perform, display, communicate, and translate a Work;
-moral rights retained by the original author(s) and/or performer(s);
-publicity and privacy rights pertaining to a person's image or likeness depicted in a Work;
-rights protecting against unfair competition in regards to a Work, subject to the limitations in paragraph 4(a), below;
-rights protecting the extraction, dissemination, use and reuse of data in a Work;
-database rights (such as those arising under Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, and under any national implementation thereof, including any amended or successor version of such directive); and
-other similar, equivalent or corresponding rights throughout the world based on applicable law or treaty, and any national implementations thereof.
-2. Waiver. To the greatest extent permitted by, but not in contravention of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and unconditionally waives, abandons, and surrenders all of Affirmer's Copyright and Related Rights and associated claims and causes of action, whether now known or unknown (including existing as well as future claims and causes of action), in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each member of the public at large and to the detriment of Affirmer's heirs and successors, fully intending that such Waiver shall not be subject to revocation, rescission, cancellation, termination, or any other legal or equitable action to disrupt the quiet enjoyment of the Work by the public as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason be judged legally invalid or ineffective under applicable law, then the Waiver shall be preserved to the maximum extent permitted taking into account Affirmer's express Statement of Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby grants to each affected person a royalty-free, non transferable, non sublicensable, non exclusive, irrevocable and unconditional license to exercise Affirmer's Copyright and Related Rights in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "License"). The License shall be deemed effective as of the date CC0 was applied by Affirmer to the Work. Should any part of the License for any reason be judged legally invalid or ineffective under applicable law, such partial invalidity or ineffectiveness shall not invalidate the remainder of the License, and in such case Affirmer hereby affirms that he or she will not (i) exercise any of his or her remaining Copyright and Related Rights in the Work or (ii) assert any associated claims and causes of action with respect to the Work, in either case contrary to Affirmer's express Statement of Purpose.
-
-4. Limitations and Disclaimers.
-
-No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document.
-Affirmer offers the Work as-is and makes no representations or warranties of any kind concerning the Work, express, implied, statutory or otherwise, including without limitation warranties of title, merchantability, fitness for a particular purpose, non infringement, or the absence of latent or other defects, accuracy, or the present or absence of errors, whether or not discoverable, all to the greatest extent permissible under applicable law.
-Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work.
-Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work.
\ No newline at end of file
diff --git a/bbcode/Setup.hs b/bbcode/Setup.hs
deleted file mode 100644
index 9a994af..0000000
--- a/bbcode/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/bbcode/bbcode.cabal b/bbcode/bbcode.cabal
deleted file mode 100644
index b17ff34..0000000
--- a/bbcode/bbcode.cabal
+++ /dev/null
@@ -1,33 +0,0 @@
--- Initial bbcode.cabal generated by cabal init.  For further 
--- documentation, see http://haskell.org/cabal/users-guide/
-
-name:                bbcode
-version:             0.0.0
-synopsis:            A tiny parser for bbcode->thermoprint-syntax-tree conversion
--- description:         
-homepage:            git://git.yggdrasil.li/thermoprint
-license:             PublicDomain
-license-file:        LICENSE
-author:              Gregor Kleen
-maintainer:          aethoago@141.li
--- copyright:           
--- category:            
-build-type:          Simple
--- extra-source-files:  
-cabal-version:       >=1.10
-
-library
-  exposed-modules:     BBCode
-  other-modules:       BBCode.Tokenizer
-                     , BBCode.Syntax
-  -- other-extensions:    
-  hs-source-dirs:      src
-  default-language:    Haskell2010
-  build-depends:       base >=4.8 && <4.9
-                     , thermoprint
-                     , attoparsec >=0.13.0 && <1
-                     , text >=1.2.1 && <2
-                     , parsec >=3.1.9 && <4
-                     , mtl >=2.2.1 && <3
-                     , case-insensitive >=1.2.0 && <2
-                     , containers >=0.5.6 && <1
\ No newline at end of file
diff --git a/bbcode/bbcode.nix b/bbcode/bbcode.nix
deleted file mode 100644
index d363a17..0000000
--- a/bbcode/bbcode.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ mkDerivation
-, stdenv
-, base
-, thermoprint
-, attoparsec, parsec, mtl, case-insensitive, containers
-}:
-mkDerivation {
-  pname = "bbcode";
-  version = "0.0.0";
-  src = ./.;
-  libraryHaskellDepends = [ base
-                            thermoprint
-                            attoparsec parsec mtl case-insensitive containers
-                          ];
-  homepage = "git://git.yggdrasil.li/thermoprint";
-  description = "A tiny parser for bbcode->thermoprint-syntax-tree conversion";
-  license = stdenv.lib.licenses.publicDomain;
-}
diff --git a/bbcode/src/BBCode.hs b/bbcode/src/BBCode.hs
deleted file mode 100644
index 087842f..0000000
--- a/bbcode/src/BBCode.hs
+++ /dev/null
@@ -1,120 +0,0 @@
-{-# LANGUAGE OverloadedStrings, OverloadedLists, RankNTypes, ImpredicativeTypes #-}
-
-module BBCode
-       ( parse
-       , make
-       ) where
-
-import Thermoprint
-
-import BBCode.Tokenizer
-import BBCode.Syntax
-
-import Data.Maybe
-import Data.Monoid
-import Data.Either
-import Data.Bifunctor
-import Data.List
-import Data.Ord
-import Data.Foldable
-
-import Data.Function (on)
-
-import           Data.CaseInsensitive  ( CI )
-import qualified Data.CaseInsensitive as CI
-
-import           Data.Map  ( Map )
-import qualified Data.Map as Map
-
-import Prelude hiding (takeWhile)
-
-import Debug.Trace
-
-knownTags :: Map (CI String) (Either (Block String -> Block String) (Inline String -> Inline String))
-knownTags = [ ("center", Left Center)
-            , ("u", Right Underline)
-            ]
-
-isBlock, isInline :: String -> Bool
-isBlock = testTag isLeft
-isInline = testTag isRight
-testTag f k = fromMaybe False (f <$> Map.lookup (CI.mk k) knownTags)
-
-data Decorated c = Decorated c [String]
-                 deriving (Show, Eq)
-
-make :: Block String -> String
-make (Over blocks) = concat $ map make blocks
-make (Center block) = "[center]" ++ make block ++ "[/center]\n"
-make (Paragraph inline) = make' inline ++ "\n"
-
-make' :: Inline String -> String
-make' (Beside inlines) = concat $ map make' inlines
-make' (Underline inline) = "[u]" ++ make' inline ++ "[/u]"
-make' (Cooked c) = c
-make' (Raw _) = error "Cannot transform block containing raw data to bbcode"
-
-parse :: String -> Either String (Block String)
-parse input = massage <$> ((remerge . blockify <$> (tokenize input >>= treeify)) >>= semantics)
-
-massage :: Block String -> Block String
-massage (Over [x]) = massage x
-massage (Over xs) = Over $ map massage xs
-massage (Center x) = Center $ massage x
-massage (Paragraph x) = Paragraph $ massage' x
-
-massage' :: Inline String -> Inline String
-massage' (Beside [x]) = massage' x
-massage' (Beside xs) = Beside $ map massage' xs
-massage' (Underline x) = Underline $ massage' x
-massage' z = z
-
-blockify :: ContentForest -> [Decorated String]
-blockify = map sortDeco . concat . map (blockify' [])
-  where
-    blockify' _ Empty = []
-    blockify' initial (Content str) = [str `Decorated` initial]
-    blockify' initial (Tagged cs tag) = concat $ map (blockify' $ tag : initial) cs
-    sortDeco :: Decorated c -> Decorated c
-    sortDeco (Decorated c tags) = Decorated c $ (nubBy ((==) `on` CI.mk) . sortBy blockiness) tags
-    blockiness :: String -> String -> Ordering
-    blockiness a b = comparing isBlock a b <> comparing CI.mk a b -- sort also alphabetically for the benefit of remerge
-
-remerge :: [Decorated String] -> ContentForest
-remerge [] = []
-remerge [(Decorated c deco)] = [appEndo applyDeco $ Content c]
-  where
-    applyDeco = foldMap (\t -> Endo (\c -> Tagged [c] t)) $ reverse deco
-remerge xs = concat $ map toTree $ groupLasts xs
-  where
-    groupLasts = groupBy ((==) `on` (listToMaybe . reverse . (\(Decorated _ ds) -> ds)))
-    -- toTree :: [Decorated String] -> [ContentTree]
-    toTree [] = []
-    toTree (x@(Decorated _ []):xs) = map (Content . (\(Decorated c []) -> c)) (x:xs)
-    toTree (x@(Decorated _ ds):xs) = [Tagged content tag]
-      where
-        tag = last ds
-        content = concat $ map toTree $ groupLasts $ map stripLast (x:xs)
-        stripLast (Decorated c ds) = Decorated c (init ds)
-
-unknownTag :: forall a. String -> Either String a
-unknownTag tag = Left $ "Unknown tag: " ++ tag
-
-semantics :: ContentForest -> Either String (Block String)
-semantics forest = Over <$> mapM semantics' forest
-
-semantics' :: ContentTree -> Either String (Block String)
-semantics' Empty = Right $ Over []
-semantics' (Content str) = Right $ Paragraph (Cooked str)
-semantics' (Tagged cs tag) = case Map.lookup (CI.mk tag) knownTags of
-  Nothing -> unknownTag tag
-  Just (Left f) -> Over . map f <$> mapM semantics' cs
-  Just (Right f) -> Paragraph . Beside . map f<$> mapM iSemantics cs
-
-iSemantics :: ContentTree -> Either String (Inline String)
-iSemantics Empty = Right $ Beside []
-iSemantics (Content str) = Right $ Cooked str
-iSemantics (Tagged cs tag) = case Map.lookup (CI.mk tag) knownTags of
-  Nothing -> unknownTag tag
-  Just (Left f) -> error "Known inline tag sorted within block"
-  Just (Right f) -> Beside . map f <$> mapM iSemantics cs
diff --git a/bbcode/src/BBCode/Syntax.hs b/bbcode/src/BBCode/Syntax.hs
deleted file mode 100644
index a196e05..0000000
--- a/bbcode/src/BBCode/Syntax.hs
+++ /dev/null
@@ -1,108 +0,0 @@
-{-# LANGUAGE RecordWildCards #-}
-
-module BBCode.Syntax
-       ( treeify
-       , ContentForest
-       , ContentTree(..)
-       ) where
-
-import BBCode.Tokenizer (Token(..))
-
-import Data.Foldable
-import Data.Bifunctor
-import Data.Monoid
-
-import Control.Monad.State
-import Control.Monad.Trans
-import Control.Monad
-  
-import           Data.CaseInsensitive  ( CI )
-import qualified Data.CaseInsensitive as CI
-
-import Data.Function (on)
-
-type ContentForest = [ContentTree]
-data ContentTree = Content String
-                 | Tagged [ContentTree] String
-                 | Empty
-                 deriving (Show, Eq)
-
-data Step = Down [ContentTree] [ContentTree] String
-          deriving (Show)
-
-data Zipper = Zipper
-              { hole :: String
-              , prevs :: [ContentTree]
-              , steps :: [Step]
-              }
-              deriving (Show)
-
-type Parser = StateT Zipper (Either String)
-abort :: String -> Parser a
-abort = lift . Left
-
-
-treeify :: [Token] -> Either String ContentForest
-treeify tokenStream = second (postProcess . unZip) $ execStateT (mapM_ incorporate tokenStream) (Zipper "" [] [])
-
-postProcess :: ContentForest -> ContentForest
-postProcess forest = do
-  tree <- forest
-  let
-    tree' = postProcess' tree
-  guard $ tree' /= Empty
-  return tree'
-  where
-    postProcess' :: ContentTree -> ContentTree
-    postProcess' (Content "") = Empty
-    postProcess' (Tagged [] _) = Empty
-    postProcess' (Tagged cs t) = Tagged [c' | c <- cs, let c' = postProcess' c, c' /= Empty ] t
-    postProcess' x = x
-
-unZip :: Zipper -> ContentForest
-unZip Zipper{..} = reverse (apply hole steps : prevs)
-
-apply :: String -> [Step] -> ContentTree
-apply hole steps = hole `apply'` (reverse steps)
-apply' "" [] = Empty
-apply' hole [] = Content hole
-apply' hole (Down pres posts tag:steps) = Tagged (reverse pres ++ [hole `apply` steps] ++ posts) tag
-
-incorporate :: Token -> Parser ()
-incorporate (Text str) = append str
-incorporate (Whitespace str)
-  | delimitsPar str = do
-      currSteps <- gets steps
-      if null currSteps then
-        modify (\Zipper{..} -> Zipper { hole = "", steps = [], prevs = (hole `apply` steps : prevs) })
-        else
-        append str
-  | otherwise = append str
-  where
-    delimitsPar str = (sum . map (const (1 :: Integer)) . filter (== '\n') $ str) >= 1
-incorporate (TagOpen tagName) = modify $ (\z@(Zipper{..}) -> z { steps = (Down [] [] tagName : steps) })
-incorporate (TagClose tagName) = do
-  currSteps <- gets steps
-  case currSteps of
-    [] -> abort $ "Closing unopenend tag: " ++ tagName
-    (Down pres posts tagName':s) -> if ((==) `on` CI.mk) tagName tagName' then
-                                      goUp
-                                    else
-                                       abort $ "Mismatched tags: [" ++ tagName' ++ "]...[/" ++ tagName ++ "]"
-
-append :: String -> Parser ()
-append str = modify (\z@(Zipper{..}) -> z { hole = hole ++ str })
-
-goUp :: Parser ()
-goUp = do
-  (Down pres posts tagName:s) <- gets steps
-  hole <- gets hole
-  let
-    steppedHole = Tagged (reverse pres ++ [Content hole] ++ posts) tagName
-  case s of
-    [] -> modify $ (\z@(Zipper{..}) -> Zipper { hole = "", prevs = steppedHole : prevs, steps = [] })
-    (t:ts) -> do
-      let
-        (Down pres posts tagName) = t
-        t' = Down (steppedHole : pres) posts tagName
-      modify $ (\z -> z { hole = "", steps = (t':ts) })
diff --git a/bbcode/src/BBCode/Tokenizer.hs b/bbcode/src/BBCode/Tokenizer.hs
deleted file mode 100644
index c860c7c..0000000
--- a/bbcode/src/BBCode/Tokenizer.hs
+++ /dev/null
@@ -1,44 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-
-module BBCode.Tokenizer
-       ( Token(..)
-       , tokenize
-       ) where
-
-import qualified Data.Text.Lazy as TL
-import qualified Data.Text as T
-
-import Control.Applicative
-import Data.Attoparsec.Text.Lazy
-
-import Data.Char (isSpace)
-import Data.Monoid (mconcat)
-
-data Token = Text String
-           | Whitespace String
-           | TagOpen String
-           | TagClose String
-           deriving (Show, Read, Eq)
-
-tokenize :: String -> Either String [Token]
-tokenize = eitherResult . parse (tokenize' <* endOfInput) . TL.pack
-
-tokenize' :: Parser [Token]
-tokenize' = many $ choice [ whitespace
-                          , Text . T.unpack <$> ("\\" *> "[")
-                          , tagClose
-                          , tagOpen
-                          , text
-                          ]
-
-whitespace :: Parser Token
-whitespace = Whitespace <$> many1 space
-
-tagOpen :: Parser Token
-tagOpen = TagOpen . T.unpack <$> ("[" *> takeWhile1 (/= ']') <* "]")
-
-tagClose :: Parser Token
-tagClose = TagClose . T.unpack <$> ("[/" *> takeWhile1 (/= ']') <* "]")
-
-text :: Parser Token
-text = Text . T.unpack <$> takeWhile1 (\c -> not (isSpace c) && notInClass "[" c)