exa/adiff
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

init

Browse source
This commit is contained in:
Mirek Kratochvil 2020-08-13 12:54:20 +02:00
commit 96ef2e732b
7 changed files with 481 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md Normal file
View file

@ -0,0 +1,5 @@
# Revision history for adiff
## 0.1.0.0 -- YYYY-mm-dd
* First version. Released on an unsuspecting world.

165
LICENSE Normal file
View file

@ -0,0 +1,165 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
This version of the GNU Lesser General Public License incorporates
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.
0. Additional Definitions.
As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU
General Public License.
"The Library" refers to a covered work governed by this License,
other than an Application or a Combined Work as defined below.
An "Application" is any work that makes use of an interface provided
by the Library, but which is not otherwise based on the Library.
Defining a subclass of a class defined by the Library is deemed a mode
of using an interface provided by the Library.
A "Combined Work" is a work produced by combining or linking an
Application with the Library. The particular version of the Library
with which the Combined Work was made is also called the "Linked
Version".
The "Minimal Corresponding Source" for a Combined Work means the
Corresponding Source for the Combined Work, excluding any source code
for portions of the Combined Work that, considered in isolation, are
based on the Application, and not on the Linked Version.
The "Corresponding Application Code" for a Combined Work means the
object code and/or source code for the Application, including any data
and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work.
1. Exception to Section 3 of the GNU GPL.
You may convey a covered work under sections 3 and 4 of this License
without being bound by section 3 of the GNU GPL.
2. Conveying Modified Versions.
If you modify a copy of the Library, and, in your modifications, a
facility refers to a function or data to be supplied by an Application
that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified
version:
a) under this License, provided that you make a good faith effort to
ensure that, in the event an Application does not supply the
function or data, the facility still operates, and performs
whatever part of its purpose remains meaningful, or
b) under the GNU GPL, with none of the additional permissions of
this License applicable to that copy.
3. Object Code Incorporating Material from Library Header Files.
The object code form of an Application may incorporate material from
a header file that is part of the Library. You may convey such object
code under terms of your choice, provided that, if the incorporated
material is not limited to numerical parameters, data structure
layouts and accessors, or small macros, inline functions and templates
(ten or fewer lines in length), you do both of the following:
a) Give prominent notice with each copy of the object code that the
Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the object code with a copy of the GNU GPL and this license
document.
4. Combined Works.
You may convey a Combined Work under terms of your choice that,
taken together, effectively do not restrict modification of the
portions of the Library contained in the Combined Work and reverse
engineering for debugging such modifications, if you also do each of
the following:
a) Give prominent notice with each copy of the Combined Work that
the Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the Combined Work with a copy of the GNU GPL and this license
document.
c) For a Combined Work that displays copyright notices during
execution, include the copyright notice for the Library among
these notices, as well as a reference directing the user to the
copies of the GNU GPL and this license document.
d) Do one of the following:
0) Convey the Minimal Corresponding Source under the terms of this
License, and the Corresponding Application Code in a form
suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.
1) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (a) uses at run time
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.
e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the
GNU GPL, and only to the extent that such information is
necessary to install and execute a modified version of the
Combined Work produced by recombining or relinking the
Application with a modified version of the Linked Version. (If
you use option 4d0, the Installation Information must accompany
the Minimal Corresponding Source and Corresponding Application
Code. If you use option 4d1, you must provide the Installation
Information in the manner specified by section 6 of the GNU GPL
for conveying Corresponding Source.)
5. Combined Libraries.
You may place library facilities that are a work based on the
Library side by side in a single library together with other library
facilities that are not Applications and are not covered by this
License, and convey such a combined library under terms of your
choice, if you do both of the following:
a) Accompany the combined library with a copy of the same work based
on the Library, uncombined with any other library facilities,
conveyed under the terms of this License.
b) Give prominent notice with the combined library that part of it
is a work based on the Library, and explaining where to find the
accompanying uncombined form of the same work.
6. Revised Versions of the GNU Lesser General Public License.
The Free Software Foundation may publish revised and/or new versions
of the GNU Lesser General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the
Library as you received it specifies that a certain numbered version
of the GNU Lesser General Public License "or any later version"
applies to it, you have the option of following the terms and
conditions either of that published version or of any later version
published by the Free Software Foundation. If the Library as you
received it does not specify a version number of the GNU Lesser
General Public License, you may choose any version of the GNU Lesser
General Public License ever published by the Free Software Foundation.
If the Library as you received it specifies that a proxy can decide
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.

2
Setup.hs Normal file
View file

@ -0,0 +1,2 @@
import Distribution.Simple
main = defaultMain

65
adiff.cabal Normal file
View file

@ -0,0 +1,65 @@
cabal-version: 2.0
-- Initial package description 'adiff.cabal' generated by 'cabal init'.
-- For further documentation, see http://haskell.org/cabal/users-guide/
name: adiff
version: 0.1.0.0
synopsis: Arbitrary-tokenization diff, patch and merge
-- A longer description of the package.
-- description:
-- A URL where users can report bugs.
-- bug-reports:
-- The license under which the package is released.
license: LGPL-3
-- The file containing the license text.
license-file: LICENSE
-- The package author(s).
author: Mirek Kratochvil
-- An email address to which users can send suggestions, bug reports, and
-- patches.
maintainer: exa.exa@gmail.com
-- A copyright notice.
-- copyright:
category: Text
build-type: Simple
-- Extra files to be distributed with the package, such as examples or a
-- README.
-- extra-source-files: CHANGELOG.md
executable adiff
-- .hs or .lhs file containing the Main module.
main-is: MainDiff.hs
-- Modules included in this executable, other than Main.
other-modules: Redfa, Version
-- LANGUAGE extensions used by modules in this package.
other-extensions: CPP
-- Other library packages from which modules are imported.
build-depends: base ^>=4.13.0.0,
mmap ^>=0.5,
regex-tdfa ^>= 1.3,
optparse-applicative ^>=0.15,
bytestring ^>= 0.10.12,
vector ^>=0.12,
utf8-string ^>=1.0
-- Directories containing source files.
hs-source-dirs: src
-- Base language which the package is written in.
default-language: Haskell2010

37
src/MainDiff.hs Normal file
View file

@ -0,0 +1,37 @@
module Main where
import Data.ByteString.UTF8 (fromString)
import Options.Applicative
import Redfa
import Version
import qualified Data.Vector as V
import System.IO.MMap
data DiffOptions =
DiffOptions
{ diffRedfaOpt :: RedfaOption
, diffFile1 :: String
, diffFile2 :: String
}
deriving (Show)
diffOpts =
DiffOptions <$> redfaOption <*> strArgument (metavar "FROMFILE") <*>
strArgument (metavar "TOFILE")
main :: IO ()
main =
let opts :: ParserInfo DiffOptions
opts =
info
(diffOpts <**> versionOption "adiff" <**> helperOption)
(fullDesc <>
progDesc "Compare files by tokens and print out differences." <>
header "adiff: arbitrary-token diff")
in do o <- execParser opts
redfa <- redfaPrepareRules (diffRedfaOpt o)
data1 <- mmapFileByteString (diffFile1 o) Nothing
data2 <- mmapFileByteString (diffFile2 o) Nothing
toks1 <- V.fromList <$> redfaTokenize redfa data1
toks2 <- V.fromList <$> redfaTokenize redfa data2
print $ toks1

185
src/Redfa.hs Normal file
View file

@ -0,0 +1,185 @@
{-# LANGUAGE FlexibleContexts #-}
module Redfa where
import Control.Monad
import qualified Data.ByteString as B
import qualified Data.ByteString.Builder as BB
import qualified Data.ByteString.Char8 as B8
import qualified Data.ByteString.Internal as BI
import qualified Data.ByteString.Lazy as BL
import Data.ByteString.UTF8 (fromString, toString)
import Data.List
import Data.Maybe
import Data.Monoid
import qualified Data.Vector as V
import Options.Applicative
import Text.Regex.TDFA
type BS = B.ByteString
data RedfaOption
= RedfaOptionRules [BS]
| RedfaOptionFile String
deriving (Show)
data RedfaSpec =
RedfaSpec
{ redfaStart :: Int
, redfaNames :: V.Vector BS
, redfaRules :: V.Vector [RedfaRule] --start, mid, jump, token
}
data RedfaRule =
RedfaRule
{ rrRegexStart :: Regex
, rrRegexMid :: Regex
, rrJump :: Int
, rrIsToken :: Bool
}
redfaOption :: Parser RedfaOption
redfaOption =
RedfaOptionRules <$>
some
(strOption $
metavar "RULE" <>
short 'r' <>
long "rule" <> help "Lexing rule (specify repeatedly for more rules)") <|>
RedfaOptionFile <$>
strOption
(metavar "RULESFILE" <>
short 'R' <>
long "rules-file" <> help "File from where to load the lexing rules")
redfaOptionToRuleStrings :: RedfaOption -> IO [BS]
redfaOptionToRuleStrings (RedfaOptionRules x) = return x
redfaOptionToRuleStrings (RedfaOptionFile fn) =
B8.lines <$> B.readFile fn -- TODO improve
splitFirst :: Char -> BS -> (BS, BS)
splitFirst c s = B.splitAt (maybe (B.length s) id $ B8.elemIndex c s) s
redfaRuleStringToRuleStr :: BS -> Maybe (BS, BS, BS, Bool)
redfaRuleStringToRuleStr s =
let (spec, regex) = splitFirst ':' s
(from, to) = splitFirst '>' spec
sf = B8.strip from
(cleanFrom, isToken)
| B.null sf = (sf, True)
| B.head sf == (fromIntegral $ fromEnum '_') = (B.tail sf, False)
| otherwise = (sf, True)
go
| B.null s = Nothing
| B.head s == 35 = Nothing -- # comment
| B.null regex = Just (B.empty, B.empty, spec, isToken)
| B.null to = Just (cleanFrom, cleanFrom, B.tail regex, isToken)
| otherwise =
Just (cleanFrom, B8.strip $ B.tail to, B.tail regex, isToken)
in go
unescapeRegex :: MonadFail m => BS -> m BS
unescapeRegex s = BL.toStrict . BB.toLazyByteString <$> unescape' s
where
unescape' :: MonadFail m => BS -> m BB.Builder
unescape' s
| B.null s = return mempty
| B.head s == BI.c2w '\\' && B.null (B.tail s) =
fail "incomplete escape sequence"
| B.head s == BI.c2w '\\' =
let rest = B.tail s
cc = B.head (rest)
thechar =
BB.stringUtf8 $
case BI.w2c cc of
'`' -> "\\`"
'\'' -> "\\'"
'b' -> "\\b"
'B' -> "\\B"
'<' -> "\\<"
'>' -> "\\>"
'a' -> "\a"
'e' -> "\x1b"
'f' -> "\f"
'n' -> "\n"
'r' -> "\r"
't' -> "\t"
'\\' -> "\\\\"
a -> [a] --TODO add support for \x and \u
in (thechar <>) <$> unescape' (B.tail rest)
| otherwise = (mappend $ BB.word8 $ B.head s) <$> unescape' (B.tail s)
redfaPrepareRules :: RedfaOption -> IO RedfaSpec
redfaPrepareRules opt = do
(states, jumps, regexes, isToken) <-
unzip4 . catMaybes . fmap redfaRuleStringToRuleStr <$>
redfaOptionToRuleStrings opt
uRegexes <- traverse unescapeRegex regexes
startREs <- traverse (makeRegexM . (fromString "\\`" <>)) uRegexes
midREs <- traverse (makeRegexM . (fromString "\\`(.|\n)" <>)) uRegexes
let ids = nub . sort $ states ++ jumps
index' = fromJust . flip elemIndex ids
statesIds = map index' states
jumpsIds = map index' jumps
start = index' $ head states
rules :: [[RedfaRule]]
rules = do
stateId <- [0 .. length ids - 1]
return $ do
(a, b, (rs, rm), t) <-
zip4 statesIds jumpsIds (zip startREs midREs) isToken
guard $ a == stateId
return $ RedfaRule rs rm b t
return $ RedfaSpec start (V.fromList ids) (V.fromList rules)
redfaTokenize :: MonadFail m => RedfaSpec -> BS -> m [(Bool, (Int, Int))]
redfaTokenize spec s = redfaTokenize' spec s (redfaStart spec) 0 []
redfaTokenize' ::
MonadFail m
=> RedfaSpec
-> BS
-> Int
-> Int
-> [Int]
-> m [(Bool, (Int, Int))]
redfaTokenize' spec s state off visited
| off >= B.length s = pure []
| otherwise =
let (ooff, reg) =
if (off == 0)
then (0, rrRegexStart)
else (1, rrRegexMid)
matchString = B.drop (off - ooff) s
matches :: [(RedfaRule, (MatchOffset, MatchLength))]
matches =
filter contOK $
zip rules $ map (\x -> match (reg x) matchString) rules
contOK (RedfaRule {rrJump = j}, (off', len))
| off' /= 0 = False
| len > ooff = True
| otherwise = not $ j `elem` visited
in case matches of
[] ->
fail $
"Tokenization could not continue from " <>
stateStrPretty <> " at offset " <> show (off + ooff)
((rule, (_, len)):_) ->
let matchLen = len - ooff
in (if matchLen > 0
then (:) (rrIsToken rule, (off, off + matchLen))
else id) <$>
redfaTokenize'
spec
s
(rrJump rule)
(off + matchLen)
(if matchLen > 0
then []
else state : visited)
where
rules = redfaRules spec V.! state
stateStr = redfaNames spec V.! state
stateStrPretty
| B.null stateStr = "anonymous state"
| otherwise = "state `" <> toString stateStr <> "'"

22
src/Version.hs Normal file
View file

@ -0,0 +1,22 @@
{-# LANGUAGE CPP #-}
module Version where
import Options.Applicative
adiffVersion :: String
adiffVersion = VERSION_adiff
versionOption prog =
infoOption
(prog <>
" version " <>
adiffVersion <>
"\nCopyright (C) 2020 Mirek Kratochvíl <exa.exa@gmail.com>\nThis is free software, you are free to change and redistribute it under the terms of GPLv3.\nThere is NO WARRANTY, to the extent permitted by law.\n\nAdapted from the original version by Arek Antoniewicz.")
(short 'v' <> long "version" <> help "display version information")
helperOption :: Parser (a -> a)
helperOption =
abortOption
ShowHelpText
(long "help" <> short 'h' <> help "Show this help text")