[WIP] Makes object-oriented code base

.circleci/config.yml

@@ -0,0 +1,20 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: debian:stretch
+
+    steps:
+      - checkout
+      - run:
+          name: Install deps
+          command: |
+            apt update -y
+            apt install -y build-essential
+      - run:
+          name: Test
+          command: |
+            cd test
+            make
+            ./test
+

.gitignore

@@ -1,3 +1,6 @@
+.vscode
 mathcalc
 core
 /*.dSYM
+/test/*.dSYM
+/test/test

Makefile

@@ -1,17 +1,23 @@
 DBG_OPTS = -O0 -g3 -Wall
-SOURCE = mathcalc.cpp
 TARGET = mathcalc
+SOURCE = mathcalc.cpp \
+	calculator.cpp \
+	stringExpression.cpp \
+	expressionList.cpp \
+	rpn.cpp
 
 mathcalc: $(SOURCE)
-	g++ $(DBG_OPTS) -Wall -o $(TARGET) $(SOURCE)
+	g++ $(DBG_OPTS) -std=c++11 -o $(TARGET) $(SOURCE)
 
-.PHONY: clean run debug release
+.PHONY: clean run release
 clean:
-	rm $(TARGET)
-	rm -r mathcalc.dSYM
+	$(shell [ -e $(TARGET) ] && rm $(TARGET))
+	$(shell [ -d $(TARGET).dSYM ] && rm -r $(TARGET).dSYM)
+	$(shell [ -e core ] && rm core)
+	@echo Done
 
 run: $(TARGET)
 	./mathcalc
 
 release: mathcalc.cpp
-	g++ -Wall -o $(TARGET) $(SOURCE)
+	g++ -o $(TARGET) $(SOURCE)

README.md

@@ -1,5 +1,8 @@
 # mathcalc
-Simple arithmetic calculater for command-line.
+> Simple arithmetic calculater for command-line.
+
+[![CircleCI](https://circleci.com/gh/IzumiSy/mathcalc.svg?style=svg)](https://circleci.com/gh/IzumiSy/mathcalc)
+
 ```bash
 $ ./mathcalc "1+2+(10*2+(5*2))+10"
 > 1+2+(10*2+(5*2))+10

calculator.cpp

@@ -0,0 +1,47 @@
+#include <string>
+#include <list>
+#include <vector>
+#include <algorithm>
+#include <iostream>
+#include "calculator.h"
+#include "stringExpression.h"
+
+// Parses string expressions of std::string into ExpressionList
+void Calculator::parse(std::string expressions) {
+  StringExpression stringExpression(expressions);
+
+  while (1) {
+    stringExpression.begin();
+    stringExpression.parseNumberValue();
+    if (stringExpression.hasNextExpression()) {
+      stringExpression.parseExpression();
+      stringExpression.next();
+    } else {
+      break;
+    }
+  }
+
+  this->expressionList = stringExpression.getExpressionsList();
+  this->expressionList.cleanupJunks();
+  return;
+}
+
+// Prints stringified ExpressionList into STDOUT
+void Calculator::print() {
+  std::cout << this->expressionList.stringify() << std::endl;
+  return;
+}
+
+// Checks out if this->expressionList has any invalid expression, and throws exceptions.
+// his method expects to be called after Calculator::parse because this->expressionList is populated by it.
+void Calculator::validate() {
+  this->expressionList.validateBracketsParing();
+  this->expressionList.validateDuplicatedSymbol();
+  this->expressionList.validateLonelySymbol();
+  return;
+}
+
+void Calculator::run() {
+  // TODO: あとでつくる
+  return;
+}

calculator.h

@@ -0,0 +1,20 @@
+#ifndef __CALCULATOR_H__
+#define __CALCULATOR_H__
+
+#include <string>
+#include <list>
+#include "expressionList.h"
+
+class Calculator {
+  private:
+    ExpressionList expressionList;
+
+  public:
+    void parse(std::string expressions);
+    void print();
+    void validate();
+    void run();
+};
+
+#endif // __CALCULATOR_H__
+