Lab2 left func exp stmt, finish add check on Struct and ExtDef, next:Fun test,Exp,CompSt

Code/a.txt

@@ -24,8 +24,6 @@ type line:1
       type : 0 BASIC : 0
     b line:4
       type : 0 BASIC : 1
-    a line:5
-      type : 0 BASIC : 0
 field finish
 ---
 Symbol Table Insert: s1 deep:1
@@ -37,8 +35,6 @@ s1 line:7
           type : 0 BASIC : 0
         b line:4
           type : 0 BASIC : 1
-        a line:5
-          type : 0 BASIC : 0
 field finish
 ---
 Symbol Table Insert: s2 deep:1
@@ -50,10 +46,29 @@ s2 line:7
           type : 0 BASIC : 0
         b line:4
           type : 0 BASIC : 1
-        a line:5
+field finish
+---
+Symbol Table Insert: s3 deep:1
+s3 line:7
+  type : 2 
+    type line:1
+      type : 2 
+        a line:3
           type : 0 BASIC : 0
+        b line:4
+          type : 0 BASIC : 1
 field finish
 ---
+Symbol Table remove: s3 1
+s3 line:7
+  type : 2 
+    type line:1
+      type : 2 
+        a line:3
+          type : 0 BASIC : 0
+        b line:4
+          type : 0 BASIC : 1
+---
 Symbol Table remove: s2 1
 s2 line:7
   type : 2 
@@ -63,8 +78,6 @@ s2 line:7
           type : 0 BASIC : 0
         b line:4
           type : 0 BASIC : 1
-        a line:5
-          type : 0 BASIC : 0
 ---
 Symbol Table remove: s1 1
 s1 line:7
@@ -75,8 +88,6 @@ s1 line:7
           type : 0 BASIC : 0
         b line:4
           type : 0 BASIC : 1
-        a line:5
-          type : 0 BASIC : 0
 ---
 Symbol Table remove: type 1
 type line:1
@@ -85,5 +96,3 @@ type line:1
       type : 0 BASIC : 0
     b line:4
       type : 0 BASIC : 1
-    a line:5
-      type : 0 BASIC : 0

Code/semantic.c

@@ -300,6 +300,7 @@ Dec : VarDec
 static FieldList * Semantic_Check_DefList(Node_t * cur) {
     if(cur == NULL) return NULL;
     FieldList * ret = Semantic_Check_Def(cur->lchild);
+    if(!ret) return NULL;
     FieldList * temp = ret;
     while (temp->tail) {
         temp = temp->tail;
@@ -317,9 +318,15 @@ static FieldList * Semantic_Check_Def(Node_t * cur) {
 static FieldList * Semantic_Check_DecList(Node_t * cur,const FieldList * field) {
     if(cur == NULL) return NULL;
     FieldList * ret = Semantic_Check_Dec(cur->lchild,field);
-    if(cur->rchild != cur->lchild)
-        ret->tail = Semantic_Check_DecList(cur->rchild,field);
-    return ret;
+    if(cur->rchild != cur->lchild) {
+        if(ret) {
+            ret->tail = Semantic_Check_DecList(cur->rchild,field);
+        } else {
+            return Semantic_Check_DecList(cur->rchild,field);
+        }
+    } else {
+        return ret;
+    }
 }
 
 static FieldList * Semantic_Check_Dec(Node_t * cur,const FieldList * field) {
@@ -337,6 +344,8 @@ static FieldList * Semantic_Check_Dec(Node_t * cur,const FieldList * field) {
     }
     if(!symbol_table->insert(node)) {
         nodeop->delete(node,INFONODE);
+        type_ops->field_delete(ret);
+        return NULL;
     }
     return ret;
 }

Test/test1.cmm

@@ -4,8 +4,8 @@ struct type
     float b;
     int a;
 };
+struct type s1,s2,s3;
 struct type s1,s2,s1;
-
 /*
 Program (1)
   ExtDefList (1)