对多级scope更好的支持

sg-first · sg-first · commit 914361c53aeb · 2019-03-26T23:44:23.000+08:00
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, 2019-03-16T16:42:03. -->
+<!-- Written by QtCreator 4.2.1, 2019-03-26T23:43:14. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/ast.cpp b/ast.cpp
@@ -169,13 +169,14 @@ BasicNode* ast::__ToAST(string &s)
             else //变量
             {
                 string name=s.substr(i, j -  i);
-                if(record::globalScope.haveVariable(name)==false) //先前没有这变量
+                Variable* v=record::globalScope.findVariable(name);
+                if(v==nullptr) //先前没有这变量
                 {
-                    Variable* v=record::globalScope.addVariable(name);
+                    v=record::globalScope.addVariable(name);
                     Variable* pv=record::globalScope.addVariable("ptr"+name);
                     pv->setBorrowVal(v);
                 }
-                stackAST.push(record::globalScope.variableList[name]);
+                stackAST.push(v);
                 i = j;
             }
         }
diff --git a/scope.cpp b/scope.cpp
@@ -66,3 +66,39 @@ void Scope::deleteFunction(Function *fun)
             this->functionList.erase(p.first);
     }
 }
+
+Variable* Scope::findVariable(string name,bool thisScope)
+{
+    Variable* result=this->variableList[name];
+
+    if(result==0)
+        result=nullptr;
+
+    if(thisScope)
+        return result;
+    else
+    {
+        if(result==nullptr)
+            return nullptr;
+        else
+            return this->fatherScope->findVariable(name,false);
+    }
+}
+
+Function* Scope::findFunction(string name,bool thisScope)
+{
+    Function* result=this->functionList[name];
+
+    if(result==0)
+        result=nullptr;
+
+    if(thisScope)
+        return result;
+    else
+    {
+        if(result==nullptr)
+            return nullptr;
+        else
+            return this->fatherScope->findFunction(name,false);
+    }
+}
diff --git a/scope.h b/scope.h
@@ -14,11 +14,11 @@ class Scope //作用是记录不同语句块内函数及变量名到实体的映
     Scope* fatherScope; //因为可能顺着作用域向上层找变量，所以需要上级节点的指针
     Scope(Scope* fatherScope=nullptr):fatherScope(fatherScope){}
 
-    Variable *addVariable(string name);
+    Variable* addVariable(string name);
     void addVariable(string name,Variable* var);
     void addFunction(string name,Function* fun);
-    bool haveVariable(string name) {return this->variableList[name]!=0;}
-    bool haveFunction(string name) {return this->functionList[name]!=0;}
+    Variable* findVariable(string name, bool thisScope=true);
+    Function* findFunction(string name,bool thisScope=true);
     //直接删除实体，在已经将所有实体引用在树中清空时使用（目前还没看到有什么用）
     //void deleteVariable(string name);
     //void deleteFunction(string name);

Original file line number	Diff line number	Diff line change
`@@ -169,13 +169,14 @@ BasicNode* ast::__ToAST(string &s)`
`169`	`169`	`else //变量`
`170`	`170`	`{`
`171`	`171`	`string name=s.substr(i, j - i);`
`172`		`- if(record::globalScope.haveVariable(name)==false) //先前没有这变量`
	`172`	`+ Variable* v=record::globalScope.findVariable(name);`
	`173`	`+ if(v==nullptr) //先前没有这变量`
`173`	`174`	`{`
`174`		`- Variable* v=record::globalScope.addVariable(name);`
	`175`	`+ v=record::globalScope.addVariable(name);`
`175`	`176`	`Variable* pv=record::globalScope.addVariable("ptr"+name);`
`176`	`177`	`pv->setBorrowVal(v);`
`177`	`178`	`}`
`178`		`- stackAST.push(record::globalScope.variableList[name]);`
	`179`	`+ stackAST.push(v);`
`179`	`180`	`i = j;`
`180`	`181`	`}`
`181`	`182`	`}`