发现PARTEVAL有BUG，大改一遍应该改好了

Author: sg-first

SCMath.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.2.1, 2018-11-01T08:15:45. -->
+<!-- Written by QtCreator 4.2.1, 2018-11-01T09:09:04. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -282,7 +282,7 @@
      <value type="int">13</value>
      <value type="int">14</value>
     </valuelist>
-    <value type="int" key="PE.EnvironmentAspect.Base">-1</value>
+    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">SCMath</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
@@ -292,7 +292,7 @@
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">SCMath.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">D:/gitreg/build-SCMath-Desktop_Qt_5_8_0_MinGW_32bit-Debug</value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>

excep.h

@@ -29,6 +29,24 @@ class VarRefUnbindExcep : public Excep {
 
 };
 
+class argumentNumExceedingExcep : public Excep {
+
+};
+
+class parameterNumExceedingExcep : public Excep {
+
+};
+
+enum callCheckMismatchType{NumberMismatch,TypeMisMatch};
+class callCheckMismatchExcep : public Excep
+{
+private:
+    int type;
+public:
+    callCheckMismatchExcep(int type):type(type) {}
+    int getType() {return this->type;}
+};
+
 class addSonExcep : public Excep
 {
 private:

main.cpp

@@ -12,10 +12,7 @@ int main()
     BasicNode* ans = ast::ToAST(s);
     output::outputAST(ans);
     cout << endl;
-    try{
-        output::outputAST(ans ->eval());
-     }
-    catch(string ){};
+    output::outputAST(ans ->eval());
     cout << endl;
     output::outputAST(ans);
     return 0;

nodetype.cpp

@@ -172,7 +172,7 @@ void FunNode::addNode(BasicNode *node)
 {
     if(!this->funEntity->isVLP()) //支持变长参数就先不进行参数个数检查
         if(this->sonNode.size()+1>this->funEntity->getParnum())
-            throw string("Exceeding the number of function parameters");
+            throw parameterNumExceedingExcep();
 
     this->sonNode.push_back(node);
 }
@@ -181,7 +181,21 @@ BasicNode* FunNode::eval()
 {
     if(this->funEntity==nullptr)
         throw string("funEntity is null");
-    return this->funEntity->eval(this->sonNode);
+    #ifdef PARTEVAL
+    try
+    {
+    #endif
+        return this->funEntity->eval(this->sonNode);
+    }
+    #ifdef PARTEVAL
+    catch(callCheckMismatchExcep e) //因为未赋值变量未求值使得参数类型不匹配，放弃对这个函数求值
+    {
+        if(e.getType()==TypeMisMatch)
+            return this;
+        else
+            throw e;
+    }
+    #endif
 }
 
 
@@ -197,12 +211,14 @@ void recursionEval(BasicNode* &node)
         {
             BasicNode* result;
             #ifdef PARTEVAL
-            try {
+            try
+            {
             #endif
                 result=node->eval();
             #ifdef PARTEVAL
             }
-            catch(unassignedEvalExcep) {}
+            catch(unassignedEvalExcep) //对未赋值变量求值，保持原样
+            {result=node;}
             #endif
             if(node->getType()!=Var)
                 delete node;
@@ -225,32 +241,32 @@ BasicNode* Function::eval(vector<BasicNode *> &sonNode)
         if(this->canBEfun(sonNode)) //参数合法
             return this->BEfun(sonNode);
         else
-            throw string("sonNode type mismatch");
+            throw callCheckMismatchExcep(TypeMisMatch);
     }
     else //不能基础求值就是正常有函数体Pro的
     {
-        this->bindFormalPar(sonNode); //子节点绑定到实参
+        this->bindArgument(sonNode); //子节点绑定到实参
         vector<BasicNode*>&funbody=this->pronode->sonNode;
-        for(int i=0;i<funbody.size()-1;i++) //最后一个可能是返回值，先留着后面单独处理
+        for(unsigned int i=0;i<funbody.size()-1;i++) //最后一个可能是返回值，先留着后面单独处理
         {
             recursionEval(funbody.at(i));
             if(funbody.at(i)->isRet())
             {
-                this->unbindFormalPar();
+                this->unbindArgument();
                 return funbody.at(i);
             }
         }
         //前面都不是返回值，最后一个是
         BasicNode* lastnode=funbody.at(funbody.size()-1);
         if(lastnode==nullptr)
         {
-            this->unbindFormalPar();
+            this->unbindArgument();
             return nullptr;
         }
         else
         {
             recursionEval(lastnode);
-            this->unbindFormalPar();
+            this->unbindArgument();
             return lastnode;
         }
     }
@@ -259,30 +275,30 @@ BasicNode* Function::eval(vector<BasicNode *> &sonNode)
 Function::~Function()
 {
     delete this->pronode;
-    for(VarReference* i:this->formalParList)
+    for(VarReference* i:this->argumentList)
         delete i;
 }
 
-void Function::addFormalPar(VarReference *var)
+void Function::addArgument(VarReference *var)
 {
-    if(this->formalParList.size()+1>this->getParnum())
-        throw string("Exceeding the number of parameters");
-    this->formalParList.push_back(var);
+    if(this->argumentList.size()+1>this->getParnum())
+        throw argumentNumExceedingExcep();
+    this->argumentList.push_back(var);
 }
 
-void Function::unbindFormalPar()
+void Function::unbindArgument()
 {
-    for(VarReference* i:this->formalParList)
+    for(VarReference* i:this->argumentList)
         i->unbind();
 }
 
-void Function::bindFormalPar(vector<BasicNode *> &sonNode)
+void Function::bindArgument(vector<BasicNode *> &sonNode)
 {
-    if(sonNode.size()!=this->formalParList.size())
-        throw string("sonNode number mismatch");
-    for(int i=0;i<this->formalParList.size();i++)
+    if(sonNode.size()!=this->argumentList.size())
+        throw callCheckMismatchExcep(NumberMismatch);
+    for(unsigned int i=0;i<this->argumentList.size();i++)
     {
-        VarReference* formalpar=this->formalParList.at(i);
+        VarReference* formalpar=this->argumentList.at(i);
         formalpar->bind(sonNode.at(i));
     }
 }

nodetype.h

@@ -31,8 +31,8 @@ class NumNode : public BasicNode
     double num;
 public:
     virtual int getType() {return Num;}
-    virtual void addNode(BasicNode *node) {throw addSonExcep(Num);}
-    virtual BasicNode* eval() {return dynamic_cast<BasicNode*>(this);}
+    virtual void addNode(BasicNode*) {throw addSonExcep(Num);}
+    virtual BasicNode* eval() {return this;}
     NumNode(double num) {this->num=num;}
     NumNode(NumNode* node):num(node->num){}
 
@@ -46,8 +46,8 @@ class StringNode : public BasicNode
     string str;
 public:
     virtual int getType() {return String;}
-    virtual void addNode(BasicNode *node) {throw addSonExcep(String);}
-    virtual BasicNode* eval() {return dynamic_cast<BasicNode*>(this);}
+    virtual void addNode(BasicNode*) {throw addSonExcep(String);}
+    virtual BasicNode* eval() {return this;}
     StringNode(string str) {this->str=str;}
     StringNode(StringNode* node):str(node->str){}
 
@@ -66,7 +66,7 @@ class VarNode : public BasicNode
     void assignmentChecking(BasicNode* val);
 public:
     virtual int getType() {return Var;}
-    virtual void addNode(BasicNode* node) {throw addSonExcep(Var);}
+    virtual void addNode(BasicNode*) {throw addSonExcep(Var);}
     virtual BasicNode* eval();
     virtual ~VarNode();
     VarNode(int valtype=-1);
@@ -99,7 +99,7 @@ class VarRefNode : public BasicNode
     void setBorrowVal(BasicNode* val);
 public:
     virtual int getType() {return VarRef;}
-    virtual void addNode(BasicNode* node) {throw addSonExcep(VarRef);}
+    virtual void addNode(BasicNode*) {throw addSonExcep(VarRef);}
     virtual ~VarRefNode();
     virtual BasicNode* eval(); //eval结果是目前形参绑定到的实参
     VarRefNode(int valtype=-1);
@@ -135,9 +135,9 @@ class Function
     bool iscanBE=false;
     //关于pro求值
     ProNode* pronode=nullptr; //是ret节点返回，最后一个元素视为返回值（如果没有填nullptr）（fix:这个ret路子可能是错的）
-    vector<VarReference*>formalParList; //形参列表，持有所有权。（warn:用了这种方法将很难并行化，一个函数实体同时只能被一组实参占用）
-    void unbindFormalPar();
-    void bindFormalPar(vector<BasicNode*>&sonNode);
+    vector<VarReference*>argumentList; //形参列表，持有所有权。（warn:用了这种方法将很难并行化，一个函数实体同时只能被一组实参占用）
+    void unbindArgument();
+    void bindArgument(vector<BasicNode*>&sonNode);
 public:
     Function(unsigned int parnum,ProNode* pronode,bool VLP=false):parnum(parnum),pronode(pronode),VLP(VLP){} //普通函数（有函数体）
     Function(unsigned int parnum,canBE canBEfun,BE BEfun,bool VLP=false):
@@ -147,7 +147,7 @@ class Function
     ProNode* getFunBody() {return this->pronode;}
     unsigned int getParnum() {return this->parnum;}
     bool isVLP() {return this->VLP;}
-    void addFormalPar(VarReference* var); //先在外面new好，然后转移所有权进来
+    void addArgument(VarReference* var); //先在外面new好，然后转移所有权进来
     BasicNode* eval(vector<BasicNode *> &sonNode);
     #ifdef READABLEGEN
     string NAME;

output.cpp

@@ -24,7 +24,7 @@ void output::outputAST(BasicNode* now, int fatherpriority)
             return;
         }
         cout << l->NAME << '(';
-        for(int i = 0 ; i < l->getParnum(); i++){
+        for(unsigned int i = 0 ; i < l->getParnum(); i++){
             outputAST(t->sonNode[i], 0);
             if(i != l->getParnum() - 1)
                 cout << ", ";

scope.cpp

@@ -14,23 +14,23 @@ Scope::~Scope()
 void Scope::addVariable(string name)
 {
     Variable* var=new Variable();
-    #ifdef READABLEcodegen
+    #ifdef READABLEGEN
     var->NAME=name;
     #endif
     this->variableList[name]=var;
 }
 
 void Scope::addVariable(string name, Variable *var)
 {
-    #ifdef READABLEcodegen
+    #ifdef READABLEGEN
     var->NAME=name;
     #endif
     this->variableList[name]=var;
 }
 
 void Scope::addFunction(string name, Function *fun)
 {
-    #ifdef READABLEcodegen
+    #ifdef READABLEGEN
     fun->NAME=name;
     #endif
     this->functionList[name]=fun;