Autocommit at 13.06.2022 @ 21:17

1 files changed, 11 insertions, 1 deletions

diff --git a/src/Models/Table.cpp b/src/Models/Table.cpp
index dc4adc7..e108c5d 100644
--- a/src/Models/Table.cpp
+++ b/src/Models/Table.cpp
@@ -35,10 +35,17 @@ void D(std::ifstream& in, List<char>& buffer) {
 }
 
 void A(std::ifstream& in, List<char>& buffer) {
-	while ((in.peek() >= '#' && in.peek() <= '~') || in.peek() == '!')
+	while ((in.peek() >= ' ' && in.peek() <= '~') && in.peek() == '"')
 		buffer.add(in.get());
 }
 
+void throwException(std::ifstream& inFile, unsigned row) {
+	throw std::logic_error((
+			(((((String("Error: Invalid character \"") += inFile.peek())
+			+= "\" at row ") += row) += "\" and column ") += ((int)inFile.tellg() / row))
+		).get_cstr());
+}
+
 void Table::readFromFile(std::ifstream& inFile) {
 	unsigned row = 0;
 	cells.add(List<Cell*>());
@@ -58,6 +65,9 @@ void Table::readFromFile(std::ifstream& inFile) {
 			inFile.get();
 			A(inFile, buffer);
 			buffer.add('\0');
+			W(inFile);
+
+			if (inFile.peek() != ',') throwException(inFile, row);
 
 			cells[row].add((buffer[0] == '=')
 				? (Cell*)new CellFormula(buffer.raw_data(), &cells)