Revision: 4520
Author: [email protected]
Date: Tue Apr 27 14:20:02 2010
Log: Rename Compare -> Comparator to resolve name conflict in v8::internal
Review URL: http://codereview.chromium.org/1737009
http://code.google.com/p/v8/source/detail?r=4520
Modified:
/branches/bleeding_edge/src/liveedit.cc
/branches/bleeding_edge/src/liveedit.h
/branches/bleeding_edge/test/cctest/test-liveedit.cc
=======================================
--- /branches/bleeding_edge/src/liveedit.cc Wed Apr 21 09:59:58 2010
+++ /branches/bleeding_edge/src/liveedit.cc Tue Apr 27 14:20:02 2010
@@ -49,7 +49,7 @@
// that helps building the chunk list.
class Differencer {
public:
- explicit Differencer(Compare::Input* input)
+ explicit Differencer(Comparator::Input* input)
: input_(input), len1_(input->getLength1()),
len2_(input->getLength2()) {
buffer_ = NewArray<int>(len1_ * len2_);
}
@@ -70,7 +70,7 @@
CompareUpToTail(0, 0);
}
- void SaveResult(Compare::Output* chunk_writer) {
+ void SaveResult(Comparator::Output* chunk_writer) {
ResultWriter writer(chunk_writer);
int pos1 = 0;
@@ -112,7 +112,7 @@
}
private:
- Compare::Input* input_;
+ Comparator::Input* input_;
int* buffer_;
int len1_;
int len2_;
@@ -195,7 +195,7 @@
class ResultWriter {
public:
- explicit ResultWriter(Compare::Output* chunk_writer)
+ explicit ResultWriter(Comparator::Output* chunk_writer)
: chunk_writer_(chunk_writer), pos1_(0), pos2_(0),
pos1_begin_(-1), pos2_begin_(-1), has_open_chunk_(false) {
}
@@ -217,7 +217,7 @@
}
private:
- Compare::Output* chunk_writer_;
+ Comparator::Output* chunk_writer_;
int pos1_;
int pos2_;
int pos1_begin_;
@@ -243,8 +243,8 @@
};
-void Compare::CalculateDifference(Compare::Input* input,
- Compare::Output* result_writer) {
+void Comparator::CalculateDifference(Comparator::Input* input,
+ Comparator::Output* result_writer) {
Differencer differencer(input);
differencer.Initialize();
differencer.FillTable();
@@ -312,7 +312,7 @@
// Represents 2 strings as 2 arrays of lines.
-class LineArrayCompareInput : public Compare::Input {
+class LineArrayCompareInput : public Comparator::Input {
public:
LineArrayCompareInput(Handle<String> s1, Handle<String> s2,
LineEndsWrapper line_ends1, LineEndsWrapper
line_ends2)
@@ -347,7 +347,7 @@
// Stores compare result in JSArray. Each chunk is stored as 3 array
elements:
// (pos1_begin, pos1_end, pos2_end).
-class LineArrayCompareOutput : public Compare::Output {
+class LineArrayCompareOutput : public Comparator::Output {
public:
LineArrayCompareOutput(LineEndsWrapper line_ends1, LineEndsWrapper
line_ends2)
: array_(Factory::NewJSArray(10)), current_size_(0),
@@ -388,7 +388,7 @@
LineArrayCompareInput input(s1, s2, line_ends1, line_ends2);
LineArrayCompareOutput output(line_ends1, line_ends2);
- Compare::CalculateDifference(&input, &output);
+ Comparator::CalculateDifference(&input, &output);
return output.GetResult();
}
=======================================
--- /branches/bleeding_edge/src/liveedit.h Wed Apr 21 09:59:58 2010
+++ /branches/bleeding_edge/src/liveedit.h Tue Apr 27 14:20:02 2010
@@ -118,7 +118,7 @@
// A general-purpose comparator between 2 arrays.
-class Compare {
+class Comparator {
public:
// Holds 2 arrays of some elements allowing to compare any pair of
=======================================
--- /branches/bleeding_edge/test/cctest/test-liveedit.cc Tue Apr 20
03:41:38 2010
+++ /branches/bleeding_edge/test/cctest/test-liveedit.cc Tue Apr 27
14:20:02 2010
@@ -38,7 +38,7 @@
// Anonymous namespace.
namespace {
-class StringCompareInput : public Compare::Input {
+class StringCompareInput : public Comparator::Input {
public:
StringCompareInput(const char* s1, const char* s2) : s1_(s1), s2_(s2) {
}
@@ -72,7 +72,7 @@
};
-class ListDiffOutputWriter : public Compare::Output {
+class ListDiffOutputWriter : public Comparator::Output {
public:
explicit ListDiffOutputWriter(DiffChunkStruct** next_chunk_pointer)
: next_chunk_pointer_(next_chunk_pointer) {
@@ -98,7 +98,7 @@
DiffChunkStruct* first_chunk;
ListDiffOutputWriter writer(&first_chunk);
- Compare::CalculateDifference(&input, &writer);
+ Comparator::CalculateDifference(&input, &writer);
int len1 = StrLength(s1);
int len2 = StrLength(s2);
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
