完成一个比较低效的析构

sg-first · sg-first · commit 2bab1e3641ca · 2018-10-16T22:45:18.000+08:00
diff --git a/SCMath.pro b/SCMath.pro
@@ -7,7 +7,8 @@ SOURCES += \
     ast.cpp \
     main.cpp \
     nodetype.cpp \
-    funinterface.cpp
+    funinterface.cpp \
+    scope.cpp
 
 HEADERS += \
     ast.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.2.1, 2018-10-16T20:00:47. -->
+<!-- Written by QtCreator 4.2.1, 2018-10-16T21:20:37. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/nodetype.cpp b/nodetype.cpp
@@ -1,5 +1,14 @@
 #include "nodetype.h"
 
+BasicNode::~BasicNode()
+{
+    for(BasicNode* node:this->sonNode)
+    {
+        if(node->getType()!=Variable) //这个随着域释放，不被连环析构
+            delete node;
+    }
+}
+
 void VariableNode::setVal(BasicNode num)
 {
     if(num.getType()==Num||num.getType()==String)
@@ -27,7 +36,9 @@ void iterEval(BasicNode* &node)
         throw string("ProNode cannot be function's sonNode");
     else
     {
-        node=node->eval(); //节点的替换在这里（父节点）完成，子节点只需要返回即可（fix:现在还没析构原来的子节点，待会写）
+        BasicNode* result=node->eval();
+        delete node;
+        node=result; //节点的替换在这里（父节点）完成，子节点只需要返回即可
     }
 }
 
diff --git a/nodetype.h b/nodetype.h
@@ -4,16 +4,17 @@
 #include <functional>
 using namespace std;
 
-enum nodeType{Basic,Num,String,Variable,Pro,Fun};
+enum nodeType{Num,String,Variable,Pro,Fun};
 
 class BasicNode //不可直接创建对象
 {
 protected:
     bool isRet=false;
 public:
-    virtual int getType(){return Basic;}
+    virtual int getType();
     virtual void addNode(BasicNode* node) {this->sonNode.push_back(node);} //使用该方法添加成员可查错
     virtual BasicNode* eval();
+    virtual ~BasicNode();
 
     void setRet() {this->isRet=true;} //不可eval节点设置ret无效
     bool getRet() {return this->isRet;}
@@ -30,7 +31,7 @@ class NumNode : public BasicNode
 public:
     virtual int getType() {return Num;}
     virtual void addNode(BasicNode *node) {throw string("NumNode no sonNode");}
-    virtual BasicNode* eval() {return dynamic_cast<BasicNode*>(this);}
+    virtual BasicNode* eval() {return dynamic_cast<BasicNode*>(new NumNode(num));} //字面量在计算后将会析构，这里要new新的
     NumNode(double num) {this->num=num;}
 
     double getNum() {return this->num;}
@@ -44,7 +45,7 @@ class StringNode : public BasicNode
 public:
     virtual int getType() {return String;}
     virtual void addNode(BasicNode *node) {throw string("String no sonNode");}
-    virtual BasicNode* eval() {return dynamic_cast<BasicNode*>(this);}
+    virtual BasicNode* eval() {return dynamic_cast<BasicNode*>(new StringNode(str));} //同上
     StringNode(string str) {this->str=str;}
 
     string getStr() {return this->str;}
@@ -59,7 +60,7 @@ class VariableNode : public BasicNode
 public:
     virtual int getType() {return Variable;}
     virtual void addNode(BasicNode* node) {throw string("VariableNode no sonNode");}
-    virtual BasicNode* eval() {return dynamic_cast<BasicNode*>(this);}
+    virtual BasicNode* eval() {return dynamic_cast<BasicNode*>(this);} //变量在scope销毁时释放，所以可以返回自身
 
     bool isEmpty() {return this->isempty;}
     void setVal(BasicNode val);
@@ -94,6 +95,7 @@ class Function
     Function(int parnum,ProNode* pronode=nullptr,bool VLP=false):parnum(parnum),pronode(pronode),VLP(VLP){} //普通函数（有函数体）
     Function(int parnum,canBE canBEfun,BE BEfun,bool VLP=false):
         parnum(parnum),canBEfun(canBEfun),BEfun(BEfun),VLP(VLP),iscanBE(true){} //调用到函数接口
+    ~Function() {delete pronode;}
 
     ProNode* getPronode() {return this->pronode;}
     int getParnum() {return this->parnum;}
@@ -105,7 +107,7 @@ class Function
 class FunNode : public BasicNode
 {
 protected:
-    Function* funEntity;
+    Function* funEntity; //所有权在scope，不在这里析构
 public:
     virtual int getType() {return Fun;}
     virtual void addNode(BasicNode* node);
diff --git a/scope.cpp b/scope.cpp
@@ -0,0 +1,11 @@
+#include "scope.h"
+
+Scope::~Scope()
+{
+    for(auto i:this->functionList)
+        delete i.second;
+    for(auto i:this->sonScope)
+        delete i.second;
+    for(Scope* i:this->sonScope)
+        delete i;
+}
diff --git a/scope.h b/scope.h
@@ -5,6 +5,7 @@
 class Scope
 {
 public:
+    ~Scope();
     map<string,VariableNode*> valueList;
     map<string,Function*> functionList;
     vector<Scope*> sonScope;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,14 @@`
`1`	`1`	`#include "nodetype.h"`
`2`	`2`
	`3`	`+BasicNode::~BasicNode()`
	`4`	`+{`
	`5`	`+ for(BasicNode* node:this->sonNode)`
	`6`	`+ {`
	`7`	`+ if(node->getType()!=Variable) //这个随着域释放，不被连环析构`
	`8`	`+ delete node;`
	`9`	`+ }`
	`10`	`+}`
	`11`	`+`
`3`	`12`	`void VariableNode::setVal(BasicNode num)`
`4`	`13`	`{`
`5`	`14`	`if(num.getType()==Num\|\|num.getType()==String)`
`@@ -27,7 +36,9 @@ void iterEval(BasicNode* &node)`
`27`	`36`	`throw string("ProNode cannot be function's sonNode");`
`28`	`37`	`else`
`29`	`38`	`{`
`30`		`- node=node->eval(); //节点的替换在这里（父节点）完成，子节点只需要返回即可（fix:现在还没析构原来的子节点，待会写）`
	`39`	`+ BasicNode* result=node->eval();`
	`40`	`+ delete node;`
	`41`	`+ node=result; //节点的替换在这里（父节点）完成，子节点只需要返回即可`
`31`	`42`	`}`
`32`	`43`	`}`
`33`	`44`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`class Scope`
`6`	`6`	`{`
`7`	`7`	`public:`
	`8`	`+ ~Scope();`
`8`	`9`	`map<string,VariableNode*> valueList;`
`9`	`10`	`map<string,Function*> functionList;`
`10`	`11`	`vector<Scope*> sonScope;`