增加了对加减乘除的拆括号

冷漠 · 冷漠 · commit 41467c129115 · 2019-02-15T12:46:54.000+08:00
diff --git a/SCMath.pro b/SCMath.pro
@@ -10,7 +10,8 @@ SOURCES += \
     funinterface.cpp \
     scope.cpp \
     output.cpp \
-    copynode.cpp
+    copynode.cpp \
+    scmath.cpp
 
 HEADERS += \
     ast.h \
@@ -19,4 +20,5 @@ HEADERS += \
     funinterface.h \
     output.h \
     excep.h \
-    marco.h
+    marco.h \
+    scmath.h
diff --git a/SCMath.pro.user b/SCMath.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.5.0, 2018-11-04T12:56:21. -->
+<!-- Written by QtCreator 4.5.0, 2019-02-15T12:44:16. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/ast.cpp b/ast.cpp
@@ -57,7 +57,6 @@ bool ast::canpush(stack<string> &stackOp, string op)
 
 BasicNode* ast::__ToAST(string &s)
 {
-    //冷漠：因为偷懒，没有略过输入的空格，输入带有空格会扔异常
     s += '$';
     stack<BasicNode*> stackAST;
     stack<string> stackOp;
diff --git a/ast.h b/ast.h
@@ -1,4 +1,4 @@
-﻿    #pragma once
+﻿#pragma once
 #include<stack>
 #include<string>
 #include<cstdlib>
diff --git a/main.cpp b/main.cpp
@@ -2,17 +2,27 @@
 #include <string>
 #include "ast.h"
 #include "output.h"
+#include "scmath.h"
 
 using namespace std;
 
 int main()
 {
+    /*
     string s = "1+2-3*4/5*(7+8-b)+sin(0)+a + 2 ^    5 ";
     BasicNode* ans = ast::ToAST(s);
     output::outputAST(ans);
     cout << endl;
     output::outputAST(ans ->eval());
     cout << endl;
     output::outputAST(ans);
+    */
+    string s ="(1+2)*(3+4)+(a+b)/(c+d)";
+    BasicNode* ans = ast::ToAST(s);
+    output::outputAST(ans);
+    cout << endl;
+    Simplificate(ans);
+    output::outputAST(ans);
+    cout << endl;
     return 0;
 }
diff --git a/scmath.cpp b/scmath.cpp
@@ -0,0 +1,46 @@
+#include "scmath.h"
+
+void Simplificate(BasicNode *&now){
+      if(now->getType() != Fun)
+        return;
+    FunNode* tempNow = (FunNode*)now;
+    if(tempNow->getEntity()->NAME  ==  "*" || tempNow->getEntity()->NAME == "/"){
+        if(tempNow->sonNode[0]->getType() == Fun){
+            FunNode* temp = (FunNode*)(tempNow->sonNode[0]);
+            if(temp->getEntity()->NAME == "+" || temp->getEntity()->NAME == "-"){
+                FunNode* newls = new FunNode(tempNow->getEntity());
+                newls->addNode(copyHelp::copyNode(temp->sonNode[0]));
+                newls->addNode(copyHelp::copyNode(tempNow->sonNode[1]));
+                FunNode* newrs = new FunNode(tempNow->getEntity());
+                newrs->addNode(copyHelp::copyNode(temp->sonNode[1]));
+                newrs->addNode(copyHelp::copyNode(tempNow->sonNode[1]));
+                FunNode* newnow = new FunNode(temp->getEntity());
+                newnow->addNode(newls);
+                newnow->addNode(newrs);
+                delete now;
+                now = newnow;
+                tempNow = (FunNode*)now;
+            }
+         }
+    }
+    if(tempNow->getEntity()->NAME  ==  "*"){
+        if(tempNow->sonNode[1]->getType() == Fun){
+            FunNode* temp = (FunNode*)(tempNow->sonNode[1]);
+            if(temp->getEntity()->NAME == "+" || temp->getEntity()->NAME == "-"){
+                FunNode* newls = new FunNode(tempNow->getEntity());
+                newls->addNode(copyHelp::copyNode(tempNow->sonNode[0]));
+                newls->addNode(copyHelp::copyNode(temp->sonNode[0]));
+                FunNode* newrs = new FunNode(tempNow->getEntity());
+                newrs->addNode(copyHelp::copyNode(tempNow->sonNode[0]));
+                newrs->addNode(copyHelp::copyNode(temp->sonNode[1]));
+                FunNode* newnow = new FunNode(temp->getEntity());
+                newnow->addNode(newls);
+                newnow->addNode(newrs);
+                delete now;
+                now = newnow;
+            }
+         }
+    }
+    Simplificate(now->sonNode[0]);
+    Simplificate(now->sonNode[1]);
+}
diff --git a/scmath.h b/scmath.h
@@ -0,0 +1,4 @@
+#pragma once
+#include "nodetype.h"
+
+void Simplificate(BasicNode *&now);

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,6 @@ bool ast::canpush(stack<string> &stackOp, string op)`
`57`	`57`
`58`	`58`	`BasicNode* ast::__ToAST(string &s)`
`59`	`59`	`{`
`60`		`- //冷漠：因为偷懒，没有略过输入的空格，输入带有空格会扔异常`
`61`	`60`	`s += '$';`
`62`	`61`	`stack<BasicNode*> stackAST;`
`63`	`62`	`stack<string> stackOp;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`- #pragma once`
	`1`	`+#pragma once`
`2`	`2`	`#include<stack>`
`3`	`3`	`#include<string>`
`4`	`4`	`#include<cstdlib>`