xaizek / zograscope (License: AGPLv3 only) (since 2018-12-07)
Mainly a syntax-aware diff that also provides a number of additional tools.
<root> / src / align.hpp (e29e1ceee873e3c2790a93064e0bcd6dcb889cdc) (2,120B) (mode 100644) [raw]
// Copyright (C) 2018 xaizek <xaizek@posteo.net>
//
// This file is part of zograscope.
//
// zograscope is free software: you can redistribute it and/or modify
// it under the terms of version 3 of the GNU Affero General Public License as
// published by the Free Software Foundation.
//
// zograscope is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with zograscope.  If not, see <http://www.gnu.org/licenses/>.

#ifndef ZOGRASCOPE_ALIGN_HPP_
#define ZOGRASCOPE_ALIGN_HPP_

#include "utils/strings.hpp"

#include <deque>
#include <string>
#include <vector>

class Node;

enum class Diff
{
    Left,
    Right,
    Identical,
    Different,
    Fold,
};

struct DiffLine
{
    DiffLine(Diff type, int data = 0) : type(type), data(data)
    { }

    Diff type;
    int data;
};

// Single line information of `DiffSource`.
struct LineInfo
{
    LineInfo() : text(boost::string_ref())
    { }
    LineInfo(boost::string_ref text, const Node *n, const Node *relative)
        : text(text), nodes({ n }), rels({ relative })
    { }

    DiceString text;                 // Unhighlighted line.
    std::vector<const Node *> nodes; // Nodes that appear on this line.
    std::vector<const Node *> rels;  // Relatives of nodes on this line.
};

// Represents tree in a form suitable for diffing.
struct DiffSource
{
    // Formats tokens from the tree without highlighting and collects meta
    // information about every line.
    explicit DiffSource(const Node &root);

    std::vector<LineInfo> lines; // Information about lines.
    std::vector<bool> modified;  // Whether certain line contains changes.

private:
    std::deque<std::string> storage; // Storage that backs the lines.
};

// Generates alignment information describing two sequences.
std::vector<DiffLine> makeDiff(DiffSource &&l, DiffSource &&r);

#endif // ZOGRASCOPE_ALIGN_HPP_
Hints

Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://code.reversed.top/user/xaizek/zograscope

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@code.reversed.top/user/xaizek/zograscope

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a pull request:
... clone the repository ...
... make some changes and some commits ...
git push origin master