Skip to content
This repository was archived by the owner on Aug 5, 2024. It is now read-only.

using STL string/container to replace QT code #67

Open
stonewell wants to merge 7 commits into
base: master
Choose a base branch
from
Open

using STL string/container to replace QT code #67

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d76675a
move to stl, compile passed
stonewell Apr 26, 2019
fa179e9
fix some tests
stonewell Apr 26, 2019
e9fb1c4
fix cleanupMerge
stonewell Apr 27, 2019
91276b0
change most of vector -> list, since we need keep reference same when…
stonewell Apr 28, 2019
69d2a66
fix tests more
stonewell Apr 28, 2019
bc37bcc
all test passed
stonewell Apr 28, 2019
c1339e1
Makefile add dependency generating, change for loop using const auto …
stonewell Apr 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Makefile add dependency generating, change for loop using const auto … 
…& to avoid copy
  • Loading branch information
@stonewell
stonewell committed Apr 28, 2019
commit c1339e10b621b0ce9cc566553cc6b04b867a50e4
1 change: 1 addition & 0 deletions cpp/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
libdiff_match_patch.a
objs/
.d/
test_diff_match_patch
22 changes: 18 additions & 4 deletions cpp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,20 @@ TEST_SRC := diff_match_patch_test.cpp
TEST_OBJECTS := $(addprefix $(OBJDIR)/, $(notdir $(patsubst %.cpp,%.o,$(TEST_SRC))))
TEST_EXEC := test_diff_match_patch

DEPDIR := .d
DEPFLAGS = -MT $@ -MMD -MP -MF$(DEPDIR)/$*.Td

POSTCOMPILE = @mv -f $(DEPDIR)/$*.Td $(DEPDIR)/$*.d && touch $@

ALL_SRC := $(SOURCES) $(TEST_SRC)

.PHONY: all clean init

all: init $(OUT_LIB) $(TEST_EXEC)

$(OBJDIR)/%.o : %.cpp %.h
$(CXX) $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -o "$@" "$<"
$(OBJDIR)/%.o : %.cpp %.h $(DEPDIR)/%.d
$(CXX) $(DEPFLAGS) $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -o "$@" "$<"
$(POSTCOMPILE)

$(OUT_LIB) : $(OBJECTS)
$(AR) -rv "$@" $(OBJECTS)
Expand All @@ -26,7 +34,13 @@ $(TEST_EXEC) : $(TEST_OBJECTS) $(OUT_LIB)
$(CXX) $(LDFLAGS) -o "$@" "$<" $(OUT_LIB)

init:
mkdir -p $(OBJDIR)
mkdir -p $(OBJDIR) $(DEPDIR)

clean:
$(RM) -r $(OUT_LIB) $(OBJDIR) $(TEST_EXEC)
$(RM) -r $(OUT_LIB) $(OBJDIR) $(TEST_EXEC) $(DEPDIR)

$(DEPDIR)/%.d: ;
.PRECIOUS: $(DEPDIR)/%.d


include $(wildcard $(patsubst %,$(DEPDIR)/%.d,$(basename $(ALL_SRC))))
28 changes: 14 additions & 14 deletions cpp/diff_match_patch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ bool Patch::isNull() const {
* Indices are printed as 1-based, not 0-based.
* @return The GNU diff string
*/
std::wstring Patch::toString() {
std::wstring Patch::toString() const {
std::wstring coords1, coords2;
if (length1 == 0) {
coords1 = std::to_wstring(start1) + std::wstring(L",0");
Expand Down Expand Up @@ -357,7 +357,7 @@ std::list<Diff> diff_match_patch::diff_lineMode(std::wstring text1, std::wstring
std::advance(p2, -1 * (count_delete + count_insert));

diffs.erase(p2, pointer);
for(Diff newDiff:
for(auto const & newDiff:
diff_main(text_delete, text_insert, false, deadline)) {
pointer = std::next(diffs.insert(pointer, newDiff));
}
Expand Down Expand Up @@ -1257,7 +1257,7 @@ int diff_match_patch::diff_xIndex(const std::list<Diff> &diffs, int loc) {
int last_chars1 = 0;
int last_chars2 = 0;
Diff lastDiff;
for(Diff aDiff: diffs) {
for(const auto & aDiff: diffs) {
if (aDiff.operation != INSERT) {
// Equality or deletion.
chars1 += aDiff.text.length();
Expand Down Expand Up @@ -1286,7 +1286,7 @@ int diff_match_patch::diff_xIndex(const std::list<Diff> &diffs, int loc) {
std::wstring diff_match_patch::diff_prettyHtml(const std::list<Diff> &diffs) {
std::wstring html;
std::wstring text;
for(Diff aDiff : diffs) {
for(const auto & aDiff : diffs) {
text = aDiff.text;
std::replace_all(text, L"&", L"&amp;");
std::replace_all(text, L"<", L"&lt;");
Expand All @@ -1312,7 +1312,7 @@ std::wstring diff_match_patch::diff_prettyHtml(const std::list<Diff> &diffs) {

std::wstring diff_match_patch::diff_text1(const std::list<Diff> &diffs) {
std::wstring text;
for(Diff aDiff: diffs) {
for(const auto & aDiff: diffs) {
if (aDiff.operation != INSERT) {
text += aDiff.text;
}
Expand All @@ -1323,7 +1323,7 @@ std::wstring diff_match_patch::diff_text1(const std::list<Diff> &diffs) {

std::wstring diff_match_patch::diff_text2(const std::list<Diff> &diffs) {
std::wstring text;
for(Diff aDiff : diffs) {
for(const auto & aDiff : diffs) {
if (aDiff.operation != DELETE) {
text += aDiff.text;
}
Expand All @@ -1336,7 +1336,7 @@ int diff_match_patch::diff_levenshtein(const std::list<Diff> &diffs) {
int levenshtein = 0;
int insertions = 0;
int deletions = 0;
for(Diff aDiff : diffs) {
for(const auto & aDiff : diffs) {
switch (aDiff.operation) {
case INSERT:
insertions += aDiff.text.length();
Expand Down Expand Up @@ -1391,7 +1391,7 @@ std::list<Diff> diff_match_patch::diff_fromDelta(const std::wstring &text1,
std::list<Diff> diffs;
int pointer = 0; // Cursor in text1
std::wstring_list tokens = std::split(delta, '\t');
for(std::wstring token: tokens) {
for(const auto & token: tokens) {
if (token.empty()) {
// Blank tokens are ok (from a trailing \t).
continue;
Expand Down Expand Up @@ -1683,7 +1683,7 @@ std::list<Patch> diff_match_patch::patch_make(const std::wstring &text1,
// context info.
std::wstring prepatch_text = text1;
std::wstring postpatch_text = text1;
for(Diff aDiff : diffs) {
for(const auto & aDiff : diffs) {
if (patch.diffs.empty() && aDiff.operation != EQUAL) {
// A new patch starts here.
patch.start1 = char_count1;
Expand Down Expand Up @@ -1749,9 +1749,9 @@ std::list<Patch> diff_match_patch::patch_make(const std::wstring &text1,

std::list<Patch> diff_match_patch::patch_deepCopy(std::list<Patch> &patches) {
std::list<Patch> patchesCopy;
for(Patch aPatch: patches) {
for(const auto & aPatch: patches) {
Patch patchCopy = Patch();
for(Diff aDiff: aPatch.diffs) {
for(const auto & aDiff: aPatch.diffs) {
Diff diffCopy = Diff(aDiff.operation, aDiff.text);
patchCopy.diffs.push_back(diffCopy);
}
Expand Down Expand Up @@ -1786,7 +1786,7 @@ std::pair<std::wstring, std::vector<bool> > diff_match_patch::patch_apply(
// has an effective expected position of 22.
int delta = 0;
std::vector<bool> results(patchesCopy.size());
for(Patch aPatch: patchesCopy) {
for(const auto & aPatch: patchesCopy) {
int expected_loc = aPatch.start2 + delta;
std::wstring text1 = diff_text1(aPatch.diffs);
int start_loc;
Expand Down Expand Up @@ -1837,7 +1837,7 @@ std::pair<std::wstring, std::vector<bool> > diff_match_patch::patch_apply(
} else {
diff_cleanupSemanticLossless(diffs);
int index1 = 0;
for(Diff aDiff: aPatch.diffs) {
for(const auto & aDiff: aPatch.diffs) {
if (aDiff.operation != EQUAL) {
int index2 = diff_xIndex(diffs, index1);
if (aDiff.operation == INSERT) {
Expand Down Expand Up @@ -2030,7 +2030,7 @@ void diff_match_patch::patch_splitMax(std::list<Patch> &patches) {

std::wstring diff_match_patch::patch_toText(const std::list<Patch> &patches) {
std::wstring text;
for(Patch aPatch: patches) {
for(const auto & aPatch: patches) {
text.append(aPatch.toString());
}
return text;
Expand Down
2 changes: 1 addition & 1 deletion cpp/diff_match_patch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class Patch {
*/
Patch();
bool isNull() const;
std::wstring toString();
std::wstring toString() const;
};


Expand Down