Import a simple text editor I started working on.

cubiclove · Dec 3, 2018 · ca6847b · ca6847b
1 parent 405383f
commit ca6847b
Show file tree

Hide file tree

Showing 59 changed files with 895 additions and 39 deletions.
diff --git a/AK/String.h → AK/AKString.h b/AK/String.h → AK/AKString.h
diff --git a/AK/Bitmap.h b/AK/Bitmap.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "StdLib.h"
+#include "StdLibExtras.h"
 #include "Types.h"
 #include "kmalloc.h"
 #include "Assertions.h"

diff --git a/AK/Buffer.h b/AK/Buffer.h
@@ -3,7 +3,7 @@
 #include "Assertions.h"
 #include "Retainable.h"
 #include "RetainPtr.h"
-#include "StdLib.h"
+#include "StdLibExtras.h"
 #include "kmalloc.h"
 
 namespace AK {

diff --git a/AK/ByteBuffer.h b/AK/ByteBuffer.h
@@ -2,7 +2,7 @@
 
 #include "Buffer.h"
 #include "Types.h"
-#include "StdLib.h"
+#include "StdLibExtras.h"
 
 namespace AK {
 

diff --git a/AK/DoublyLinkedList.h b/AK/DoublyLinkedList.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "StdLib.h"
+#include "StdLibExtras.h"
 
 namespace AK {
 

diff --git a/AK/FileSystemPath.h b/AK/FileSystemPath.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "String.h"
+#include "AKString.h"
 
 namespace AK {
 

diff --git a/AK/Function.h b/AK/Function.h
@@ -27,7 +27,7 @@
 
 #include "Assertions.h"
 #include "OwnPtr.h"
-#include "StdLib.h"
+#include "StdLibExtras.h"
 
 namespace AK {
 

diff --git a/AK/HashMap.h b/AK/HashMap.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "HashTable.h"
-#include "StdLib.h"
+#include "StdLibExtras.h"
 #include "kstdio.h"
 
 namespace AK {

diff --git a/AK/HashTable.h b/AK/HashTable.h
@@ -3,7 +3,7 @@
 #include "Assertions.h"
 #include "DoublyLinkedList.h"
 #include "Traits.h"
-#include "StdLib.h"
+#include "StdLibExtras.h"
 #include "kstdio.h"
 
 //#define HASHTABLE_DEBUG

diff --git a/AK/Makefile b/AK/Makefile
@@ -5,7 +5,7 @@ CXXFLAGS = -std=c++17 -O0 -W -Wall -ggdb3
 
 all: $(PROGRAM)
 
-test.o: Vector.h String.h StringImpl.h MappedFile.h HashTable.h SinglyLinkedList.h Traits.h HashMap.h TemporaryFile.h Buffer.h FileSystemPath.h StringBuilder.h
+test.o: Vector.h AKString.h StringImpl.h MappedFile.h HashTable.h SinglyLinkedList.h Traits.h HashMap.h TemporaryFile.h Buffer.h FileSystemPath.h StringBuilder.h
 
 .cpp.o:
  $(CXX) $(CXXFLAGS) -o $@ -c $<

diff --git a/AK/MappedFile.h b/AK/MappedFile.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "String.h"
+#include "AKString.h"
 
 namespace AK {
 

diff --git a/AK/Noncopyable.h b/AK/Noncopyable.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#define AK_MAKE_NONCOPYABLE(c) \
+private: \
+ c(const c&) = delete; \
+ c& operator=(const c&) = delete;
diff --git a/AK/OwnPtr.h b/AK/OwnPtr.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "StdLib.h"
+#include "StdLibExtras.h"
 #include "Types.h"
 #include "Traits.h"
 

diff --git a/AK/StdLib.h → AK/StdLibExtras.h b/AK/StdLib.h → AK/StdLibExtras.h
diff --git a/AK/String.cpp b/AK/String.cpp
@@ -1,5 +1,5 @@
-#include "String.h"
-#include "StdLib.h"
+#include "AKString.h"
+#include "StdLibExtras.h"
 
 namespace AK {
 

diff --git a/AK/StringBuilder.h b/AK/StringBuilder.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "String.h"
+#include "AKString.h"
 #include "Vector.h"
 
 namespace AK {

diff --git a/AK/StringImpl.cpp b/AK/StringImpl.cpp
@@ -1,5 +1,5 @@
 #include "StringImpl.h"
-#include "StdLib.h"
+#include "StdLibExtras.h"
 #include "kmalloc.h"
 
 namespace AK {

diff --git a/AK/TemporaryFile.h b/AK/TemporaryFile.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "String.h"
+#include "AKString.h"
 #include <stdio.h>
 
 namespace AK {

diff --git a/AK/test.cpp b/AK/test.cpp
@@ -1,4 +1,4 @@
-#include "String.h"
+#include "AKString.h"
 //#include "StringBuilder.h"
 #include "Vector.h"
 #include <stdio.h>

diff --git a/Editor/Document.cpp b/Editor/Document.cpp
@@ -0,0 +1,46 @@
+#include "Document.h"
+#include "FileReader.h"
+
+OwnPtr<Document> Document::create_from_file(const std::string& path)
+{
+ auto document = make<Document>();
+
+ FileReader reader(path);
+ while (reader.can_read()) {
+ auto line = reader.read_line();
+ document->m_lines.push_back(Line(line));
+ }
+
+ return document;
+}
+
+void Document::dump()
+{
+ fprintf(stderr, "Document{%p}\n", this);
+ for (size_t i = 0; i < m_lines.size(); ++i) {
+ fprintf(stderr, "[%02zu] %s\n", i, m_lines[i].data().c_str());
+ }
+}
+
+bool Document::backspace_at(Position position)
+{
+ return false;
+}
+
+bool Document::insert_at(Position position, const std::string& text)
+{
+ static FILE* f = fopen("log", "a");
+ fprintf(f, "@%zu,%zu: +%s\n", position.line(), position.column(), text.c_str());
+ fflush(f);
+ ASSERT(position.is_valid());
+ if (!position.is_valid())
+ return false;
+ ASSERT(position.line() < line_count());
+ if (position.line() >= line_count())
+ return false;
+ Line& line = m_lines[position.line()];
+ if (position.column() > line.length())
+ return false;
+ line.insert(position.column(), text);
+ return true;
+}
diff --git a/Editor/Document.h b/Editor/Document.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "cuki.h"
+#include "Line.h"
+#include "Position.h"
+#include "OwnPtr.h"
+#include <string>
+
+class Document {
+public:
+ Document() { }
+ ~Document() { }
+
+ const std::deque<Line>& lines() const { return m_lines; }
+ std::deque<Line>& lines() { return m_lines; }
+ size_t line_count() const { return m_lines.size(); }
+
+ static OwnPtr<Document> create_from_file(const std::string& path);
+
+ bool insert_at(Position, const std::string&);
+ bool backspace_at(Position);
+
+ void dump();
+
+private:
+ std::deque<Line> m_lines;
+};