提交: 586efdb424a2688ab0dfd47709bc0f10b3cdfbb6 - star (git)

Commit MetaInfo

• 修訂: 586efdb424a2688ab0dfd47709bc0f10b3cdfbb6 (tree)
• 時間: 2018-11-17 23:28:20
• 作者: dhrname <dhrname@user...>
• Commiter: dhrname

Log Message

Modify the ST_parse

Change Summary

• modified: source_code/shadowstar.c
• modified: source_code/shadowstar.h
• modified: source_code/shadowstar.o
• modified: source_code/startest.c
• modified: source_code/startest.o

差異

--- a/source_code/shadowstar.c
+++ b/source_code/shadowstar.c
@@ -419,6 +419,7 @@ static inline void free_stacklist (ST_Stack_List s)
 }
 
 /*ST_parse関数
+ * N-木のfreetreeは、後でfreenode関数で解放するためのもの
  * トークン配列arrayでパーサ解析
  * 連結リストのlistは束縛変数の値を格納している
  * 返り値はパースされたノードリスト
@@ -431,7 +432,7 @@ static inline void free_stacklist (ST_Stack_List s)
  * 2, y x.xλ
  * 3, 「y x」（x)
  * 4,「yをx」（x）*/
-ST_Node ST_parse(ST_Token_Mode *array, size_t length, ST_Ordered_Pair *list)
+ST_Node ST_parse(ST_Node freetree, ST_Token_Mode *array, size_t length, ST_Ordered_Pair *list)
 {
     if (ST_isEmpty(list))
     {
@@ -473,7 +474,10 @@ ST_Node ST_parse(ST_Token_Mode *array, size_t length, ST_Ordered_Pair *list)
     ST_Node seq = ST_EMPTY_NODE;
     
     /*変数seqが空ノードに初期化されるので、この変数にキャッシュしておく*/
-    ST_Node seq_cache = ST_createNode(ST_EMPTY_NODE);
+    ST_Node seq_cache = ST_createNode(freetree);
+    
+    /*返り値となるルート*/
+    ST_Node root = seq_cache;
 
     for (int_fast32_t i=length-1; i>=0; i--)
     {
@@ -499,7 +503,7 @@ ST_Node ST_parse(ST_Token_Mode *array, size_t length, ST_Ordered_Pair *list)
             case ST_KAGIKAKKO_END_TOKEN:
                 /*新しく子ノードとして追加したものの末子ノードが現在ノードになる
                  *その現在ノードをseq_cacheに入れる*/
-                seq_cache = ST_insertBefore(ST_getParentNode(seq), ST_createNode(ST_EMPTY_NODE), seq);
+                seq_cache = ST_insertBefore(seq_cache, ST_createNode(ST_EMPTY_NODE), seq);
                 seq = ST_EMPTY_NODE;
                 break;
             case ST_KAGIKAKKO_BEGIN_TOKEN:
@@ -513,8 +517,15 @@ ST_Node ST_parse(ST_Token_Mode *array, size_t length, ST_Ordered_Pair *list)
         }
     }
     free_stacklist(bound_vstacklist);
-
-    return seq;
+    
+    if (ST_isEmptyNode(seq))
+    {
+        return ST_EMPTY_NODE;
+    }
+    else
+    {
+        return root;
+    }
 }
 
 /*ST_eval 関数

--- a/source_code/shadowstar.h
+++ b/source_code/shadowstar.h
@@ -28,7 +28,7 @@ ST_Ordered_Pair* ST_tokenize(ST_Char*, ST_Token_Mode*);
 /*ST_parse関数
  * トークン配列からパーサを作る
  * 返却値は解析リスト*/
-ST_Node ST_parse(ST_Token_Mode*, size_t, ST_Ordered_Pair*);
+ST_Node ST_parse(ST_Node, ST_Token_Mode*, size_t, ST_Ordered_Pair*);
 
 /*ベータ簡約を用いて、解析リストの評価を行う*/
 ST_Node ST_eval(ST_Ordered_Pair*, ST_Node);

Binary files a/source_code/shadowstar.o and b/source_code/shadowstar.o differ

--- a/source_code/startest.c
+++ b/source_code/startest.c
@@ -277,24 +277,26 @@ int main(int argc, char **argv)
     
     init_token(tokens);
     length = sizeof(tokens)/sizeof(tokens[0]);
-    ST_parse(tokens, length, ST_EMPTY);
-    assert(ST_isEmptyNode(ST_parse(tokens, length, ST_EMPTY)));
+    /*解放用のツリー*/
+    ST_Node freetree = ST_createNode(ST_EMPTY_NODE);
+    ST_parse(freetree, tokens, length, ST_EMPTY);
+    assert(ST_isEmptyNode(ST_parse(freetree, tokens, length, ST_EMPTY)));
     varlist = ST_tokenize(u8"aBa愛", tokens);
-    assert(ST_isEmptyNode(ST_parse(tokens, length, varlist)));
+    assert(ST_isEmptyNode(ST_parse(freetree, tokens, length, varlist)));
     ST_freelist(varlist);
     init_token(tokens1);
     length = sizeof(tokens1)/sizeof(tokens1[0]);
-    ST_parse(tokens1, length, ST_EMPTY);
-    assert(ST_isEmptyNode(ST_parse(tokens1, length, ST_EMPTY)));
+    ST_parse(freetree, tokens1, length, ST_EMPTY);
+    assert(ST_isEmptyNode(ST_parse(freetree, tokens1, length, ST_EMPTY)));
     varlist = ST_tokenize(u8"aBa愛", tokens1);
-    assert(ST_isEmptyNode(ST_parse(tokens1, length, varlist)));
+    assert(ST_isEmptyNode(ST_parse(freetree, tokens1, length, varlist)));
     ST_freelist(varlist);
     
     ST_Token_Mode tokens2[7] = {0};
     init_token(tokens2);
     length = sizeof(tokens2) / sizeof(tokens2[0]);
     varlist = ST_tokenize(u8"（愛あ）（愛）", tokens2);
-    assert(ST_isEmptyNode(ST_parse(tokens2, length, varlist)));
+    assert(ST_isEmptyNode(ST_parse(freetree, tokens2, length, varlist)));
     assert(ST_first(ST_second(varlist)) != ST_first(varlist));
     ST_freelist(varlist);
     init_token(tokens2);
@@ -303,23 +305,23 @@ int main(int argc, char **argv)
     tokens2[5] = 0;
     tokens2[6] = 0;
     varlist = ST_tokenize(u8"「愛あ」（愛）", tokens2);
-    assert(!ST_isEmptyNode(ST_parse(tokens2, length, varlist)));
+    assert(!ST_isEmptyNode(ST_parse(freetree, tokens2, length, varlist)));
     assert(ST_first(ST_second(varlist)) == ST_first(varlist));
     ST_freelist(varlist);
-    /*
+    
     ST_Token_Mode tokens3[12] = {0};
     length = sizeof(tokens3) / sizeof(tokens3[0]);
     varlist = ST_tokenize(u8"「愛「愛」（愛）」（愛）", tokens3);
-    assert(!ST_isEmptyNode(ST_parse(tokens3, length, varlist)));
+    assert(!ST_isEmptyNode(ST_parse(freetree, tokens3, length, varlist)));
     assert(ST_first(ST_second(varlist)) != ST_first(varlist));
     assert(ST_getItem(varlist, 1) != ST_first(varlist));
     assert(ST_getItem(varlist, 0) == ST_first(varlist));
     ST_freelist(varlist);
-    
+    /*
     ST_Token_Mode tokens4[12] = {0};
     length = sizeof(tokens4) / sizeof(tokens4[0]);
     varlist = ST_tokenize(u8"「愛」（愛）「愛」（愛）", tokens4);
-    assert(!ST_isEmptyNode(ST_parse(tokens4, length, varlist)));
+    assert(!ST_isEmptyNode(ST_parse(freetree, tokens4, length, varlist)));
     assert(ST_first(ST_second(varlist)) == ST_first(varlist));
     assert(ST_getItem(varlist, 2) != ST_first(varlist));
     assert(ST_getItem(varlist, 3) != ST_first(varlist));
@@ -330,7 +332,7 @@ int main(int argc, char **argv)
     ST_Token_Mode tokens5[12] = {0};
     length = sizeof(tokens5) / sizeof(tokens5[0]);
     varlist = ST_tokenize(u8"「謎」（謎）「愛」（愛）", tokens5);
-    assert(!ST_isEmptyNode(ST_parse(tokens5, length, varlist)));
+    assert(!ST_isEmptyNode(ST_parse(freetree, tokens5, length, varlist)));
     assert(ST_first(ST_second(varlist)) == ST_first(varlist));
     assert(ST_getItem(varlist, 2) != ST_first(varlist));
     assert(ST_getItem(varlist, 3) != ST_first(varlist));
@@ -340,7 +342,7 @@ int main(int argc, char **argv)
    
     init_token_length(tokens5, length);
     varlist = ST_tokenize(u8"謎は「愛を愛する」（愛）", tokens5);
-    ST_Node btr = ST_parse(tokens5, length, varlist);
+    ST_Node btr = ST_parse(freetree, tokens5, length, varlist);
     assert( ST_isEmpty(ST_getPreviousNode(ST_getPreviousNode(btr))) );
     assert( ST_isEmpty(ST_getPreviousNode(ST_getPreviousNode(ST_getLastChild(btr)))) );
     assert( ST_getBoundVariable(ST_getNodeValue(btr)) == ST_getItem(varlist, 0));
@@ -352,7 +354,7 @@ int main(int argc, char **argv)
     
     init_token_length(tokens5, length);
     varlist = ST_tokenize(u8"「謎」（謎）「愛」（愛）", tokens5);
-    btr = ST_parse(tokens5, length, varlist);
+    btr = ST_parse(freetree, tokens5, length, varlist);
     assert( ST_isEmpty(ST_getPreviousNode(ST_getPreviousNode(btr))) );
     assert( ST_isEmpty(ST_getPreviousNode(ST_getLastChild(btr))) );
     assert( ST_getBoundVariable(ST_getNodeValue(btr)) == ST_getItem(varlist, 0));
@@ -370,7 +372,7 @@ int main(int argc, char **argv)
     
     init_token_length(tokens5, length);
     varlist = ST_tokenize(u8"「「謎」（謎）愛」（愛）", tokens5);
-    btr = ST_parse(tokens5, length, varlist);
+    btr = ST_parse(freetree, tokens5, length, varlist);
     assert( ST_isEmpty(ST_getPreviousNode(btr)) );
     assert( ST_isEmpty(ST_getPreviousNode(ST_getPreviousNode(ST_getLastChild(btr)))) );
     assert( ST_getBoundVariable(ST_getNodeValue(btr)) == ST_getItem(varlist, 0));
@@ -385,7 +387,7 @@ int main(int argc, char **argv)
     
     init_token_length(tokens5, length);
     varlist = ST_tokenize(u8"「涙を思考する言葉」（世界）", tokens5);
-    btr = ST_parse(tokens5, length, varlist);
+    btr = ST_parse(freetree, tokens5, length, varlist);
     assert(ST_getBoundVariable(ST_getNodeValue(btr)) == ST_getItem(varlist, 0) );
     lastvar = ST_getLastChild(btr);
     assert( ST_first(ST_getNodeValue(lastvar)) == ST_getItem(varlist, 1) );
@@ -399,7 +401,7 @@ int main(int argc, char **argv)
     ST_Token_Mode tokens6[24] = {0};
     length = sizeof(tokens6) / sizeof(tokens6[0]);
     varlist = ST_tokenize(u8"「言葉」（世界）「「涙」（謎）愛」（謎）", tokens6);
-    btr = ST_parse(tokens6, length, varlist);
+    btr = ST_parse(freetree, tokens6, length, varlist);
     assert( ST_getBoundVariable(ST_getNodeValue(btr)) == ST_getItem(varlist, 0) );
     assert( ST_getBoundVariable(ST_getNodeValue(ST_setChurchNumber(1, ST_getPreviousNode, btr))) == ST_getItem(varlist, 4) );
     lastvar = ST_getLastChild(btr);
@@ -415,7 +417,7 @@ int main(int argc, char **argv)
     
     init_token_length(tokens6, length);
     varlist = ST_tokenize(u8"「言葉」(半角括弧)「「涙」(謎)愛」(謎)", tokens6);
-    btr = ST_parse(tokens6, length, varlist);
+    btr = ST_parse(freetree, tokens6, length, varlist);
     assert(ST_getBoundVariable(ST_getNodeValue(btr)) == ST_getItem(varlist, 0) );
     assert(ST_getBoundVariable(ST_getNodeValue(ST_getPreviousNode(ST_getLastChild(btr)))) == ST_getItem(varlist, 2) );
     assert(ST_getBoundVariable(ST_getNodeValue(ST_getPreviousNode(btr))) == ST_getItem(varlist, 4) );
@@ -424,7 +426,7 @@ int main(int argc, char **argv)
     
     init_token_length(tokens6, length);
     varlist = ST_tokenize(u8"「「涙」（謎）言葉」（世界）「愛」（謎）", tokens6);
-    btr = ST_parse(tokens6, length, varlist);
+    btr = ST_parse(freetree, tokens6, length, varlist);
     assert(ST_getBoundVariable(ST_getNodeValue(btr)) == ST_getItem(varlist, 0) );
     assert(ST_getBoundVariable(ST_getNodeValue(ST_getPreviousNode(btr))) == ST_getItem(varlist, 2) );
     assert(ST_getBoundVariable(ST_getNodeValue(ST_getPreviousNode(ST_getLastChild(ST_getPreviousNode(btr))))) == ST_getItem(varlist, 4) );
@@ -439,7 +441,7 @@ int main(int argc, char **argv)
     
     init_token_length(tokens6, length);
     varlist = ST_tokenize(u8"「「「涙」（謎）言葉」（世界）愛」（謎）", tokens6);
-    btr = ST_parse(tokens6, length, varlist);
+    btr = ST_parse(freetree, tokens6, length, varlist);
     assert( ST_getBoundVariable(ST_getNodeValue(btr)) == ST_getItem(varlist, 0) );
     lastvar = ST_getLastChild(btr);
     assert( ST_getBoundVariable(ST_getNodeValue(ST_getPreviousNode(lastvar))) == ST_getItem(varlist, 2) );
@@ -452,7 +454,7 @@ int main(int argc, char **argv)
     
     init_token_length(tokens6, length);
     varlist = ST_tokenize(u8"「「涙」（謎）「言葉」（世界）愛」（謎）", tokens6);
-    btr = ST_parse(tokens6, length, varlist);
+    btr = ST_parse(freetree, tokens6, length, varlist);
     assert(ST_getBoundVariable(ST_getNodeValue(btr)) == ST_getItem(varlist, 0) );
     lastvar = ST_getLastChild(btr);
     assert(ST_getBoundVariable(ST_getNodeValue(ST_getPreviousNode(lastvar))) == ST_getItem(varlist, 2) );
@@ -467,7 +469,7 @@ int main(int argc, char **argv)
     length = sizeof(tokens2) / sizeof(tokens2[0]);
     init_token_length(tokens2, length);
     varlist = ST_tokenize(u8"「涙」（謎）", tokens2);
-    btr = ST_parse(tokens2, length, varlist);
+    btr = ST_parse(freetree, tokens2, length, varlist);
     ST_Node evalresult = ST_eval(varlist, btr);
     assert(btr != evalresult);
     assert( ST_getBoundVariable(ST_getNodeValue(evalresult)) == ST_getItem(varlist, 0) );
@@ -480,7 +482,7 @@ int main(int argc, char **argv)
     length = sizeof(tokens6) / sizeof(tokens6[0]);
     init_token_length(tokens6, length);
     varlist = ST_tokenize(u8"「海」(愛)とは、「涙」（謎）", tokens6);
-    btr = ST_parse(tokens6, length, varlist);
+    btr = ST_parse(freetree, tokens6, length, varlist);
     evalresult = ST_eval(varlist, btr);
     assert( ST_getBoundVariable(ST_getNodeValue(evalresult)) == ST_getItem(varlist, 0) );
     assert( ST_first(ST_getNodeValue(ST_getLastChild(evalresult))) == ST_getItem(varlist, 1) );
@@ -494,7 +496,7 @@ int main(int argc, char **argv)
     
     init_token_length(tokens6, length);
     varlist = ST_tokenize(u8"「海」(愛)とは、「謎」（謎）", tokens6);
-    btr = ST_parse(tokens6, length, varlist);
+    btr = ST_parse(freetree, tokens6, length, varlist);
     evalresult = ST_eval(varlist, btr);
     assert( ST_getBoundVariable(ST_getNodeValue(evalresult)) == ST_getItem(varlist, 2) );
     assert( ST_first(ST_getNodeValue(ST_getLastChild(evalresult))) == ST_getItem(varlist, 3) );

Binary files a/source_code/startest.o and b/source_code/startest.o differ