支持Scope中删除实体，绑定顶层节点

sg-first · sg-first · commit b6c5d9227570 · 2018-10-27T11:55:11.000+08:00
diff --git a/ast.cpp b/ast.cpp
@@ -1,6 +1,6 @@
 #include "ast.h"
 #include "funinterface.h"
-#ifdef parserdebug
+#ifdef READABLEcodegen
 #include<iostream>
 #endif
 
@@ -95,7 +95,7 @@ BasicNode* ast::ToAST(string s) {
     return stackAST.top();
 }
 
-#ifdef parserdebug
+#ifdef READABLEcodegen
 void ast::outputAST(BasicNode* now){
     if(now == nullptr)
         return;
diff --git a/ast.h b/ast.h
@@ -20,7 +20,7 @@ namespace ast
     BasicNode* ToAST(string);
     bool canpush(stack<string> &, string);
 
-    #ifdef parserdebug
+    #ifdef READABLEcodegeng
     void outputAST(BasicNode *);
     #endif
 
diff --git a/nodetype.cpp b/nodetype.cpp
@@ -250,8 +250,7 @@ BasicNode* Function::eval(vector<BasicNode *> &sonNode)
 
 Function::~Function()
 {
-    if(this->pronode!=nullptr)
-        delete this->pronode;
+    delete this->pronode;
     for(VarReference* i:this->formalParList)
         delete i;
 }
diff --git a/nodetype.h b/nodetype.h
@@ -3,7 +3,7 @@
 #include <vector>
 #include <functional>
 using namespace std;
-#define parserdebug
+#define READABLEcodegen
 
 enum nodeType{Num,String,Var,Pro,Fun,VarRef};
 
@@ -80,7 +80,7 @@ class VarNode : public BasicNode
     void setBorrowVal(BasicNode* val); //直接对值进行赋值，用这个不转移所有权（一般赋值为变量指针用）
     void setVarVal(VarNode* node); //传递变量的值到this的值，即需要进行一次解包
     void clearVal();
-    #ifdef parserdebug
+    #ifdef READABLEcodegen
     string NAME;
     #endif
 };
@@ -150,7 +150,7 @@ class Function
     bool isVLP() {return this->VLP;}
     void addFormalPar(VarReference* var); //先在外面new好，然后转移所有权进来
     BasicNode* eval(vector<BasicNode *> &sonNode);
-    #ifdef parserdebug
+    #ifdef READABLEcodegen
     string NAME;
     #endif
 };
diff --git a/scope.cpp b/scope.cpp
@@ -2,6 +2,7 @@
 
 Scope::~Scope()
 {
+    delete this->topASTNode;
     for(auto i:this->functionList)
         delete i.second;
     for(auto i:this->variableList)
@@ -10,27 +11,57 @@ Scope::~Scope()
         delete i;
 }
 
-void Scope::addValue(string name)
+void Scope::addVariable(string name)
 {
     Variable* var=new Variable();
-    #ifdef parserdebug
+    #ifdef READABLEcodegen
     var->NAME=name;
     #endif
     this->variableList[name]=var;
 }
 
-void Scope::addValue(string name, Variable *var)
+void Scope::addVariable(string name, Variable *var)
 {
-    #ifdef parserdebug
+    #ifdef READABLEcodegen
     var->NAME=name;
     #endif
     this->variableList[name]=var;
 }
 
 void Scope::addFunction(string name, Function *fun)
 {
-    #ifdef parserdebug
+    #ifdef READABLEcodegen
     fun->NAME=name;
     #endif
     this->functionList[name]=fun;
 }
+
+/*void Scope::deleteFunction(string name)
+{
+    delete this->functionList[name];
+    this->functionList.erase(name);
+}
+
+void Scope::deleteVariable(string name)
+{
+    delete this->variableList[name];
+    this->variableList.erase(name);
+}*/
+
+void Scope::deleteVariable(Variable *var)
+{
+    for(auto p:this->variableList)
+    {
+        if(p.second==var)
+            this->variableList.erase(p.first);
+    }
+}
+
+void Scope::deleteFunction(Function *fun)
+{
+    for(auto p:this->functionList)
+    {
+        if(p.second==fun)
+            this->functionList.erase(p.first);
+    }
+}
diff --git a/scope.h b/scope.h
@@ -4,15 +4,24 @@
 
 class Scope //作用是记录不同语句块内函数及变量名到实体的映射，不是运行时栈
 {
+private:
+    BasicNode* topASTNode=nullptr; //这是完全包含本域所有实体引用的根节点，否则会释放外部需要使用的实体
 public:
     ~Scope();
     map<string,Variable*> variableList;
     map<string,Function*> functionList;
     vector<Scope*> sonScope;
-    Scope* fatherScope;
+    Scope* fatherScope; //因为可能顺着作用域向上层找变量，所以需要上级节点的指针
     Scope(Scope* fatherScope=nullptr):fatherScope(fatherScope){}
 
-    void addValue(string name);
-    void addValue(string name,Variable* var);
+    void addVariable(string name);
+    void addVariable(string name,Variable* var);
     void addFunction(string name,Function* fun);
+    //直接删除实体，在已经将所有实体引用在树中清空时使用（目前还没看到有什么用）
+    //void deleteVariable(string name);
+    //void deleteFunction(string name);
+    //删除实体指针在域中的存储，在已经将所有实体引用在树中清空时使用且已经delete时使用
+    void deleteVariable(Variable* var);
+    void deleteFunction(Function* fun);
+    void settopASTNode(BasicNode* topnode) {this->topASTNode=topnode;}
 };

Original file line number	Diff line number	Diff line change
`@@ -250,8 +250,7 @@ BasicNode* Function::eval(vector<BasicNode *> &sonNode)`
`250`	`250`
`251`	`251`	`Function::~Function()`
`252`	`252`	`{`
`253`		`- if(this->pronode!=nullptr)`
`254`		`- delete this->pronode;`
	`253`	`+ delete this->pronode;`
`255`	`254`	`for(VarReference* i:this->formalParList)`
`256`	`255`	`delete i;`
`257`	`256`	`}`