Commit: becce3d8475b022a00e1323339028bb8921d1019 - star (git)

Commit MetaInfo

• Revision: becce3d8475b022a00e1323339028bb8921d1019 (tree)
• Time: 2019-01-11 23:13:41
• Author: dhrname <dhrname@user...>
• Commiter: dhrname

Log Message

Remove the ST_setItemNode function

Change Summary

• modified: source_code/orderedpair/list/tree/nodelist/ntree.h
• modified: source_code/shadowstar.c
• modified: source_code/shadowstar.o
• modified: source_code/startest.c
• modified: source_code/startest.o

Incremental Difference

--- a/source_code/orderedpair/list/tree/nodelist/ntree.h
+++ b/source_code/orderedpair/list/tree/nodelist/ntree.h
@@ -100,11 +100,6 @@ void ST_freenode (ST_Free_Node);
 /*ST_Node2Node 関数型 = (ST_Node -> ST_Node) */
 typedef ST_Node (*ST_Node2Node)(ST_Node);
 
-/*ST_setItemNode 関数
- * C言語でラムダ計算のchurch数を部分的に再現するための関数(ノード用)*/
-ST_Node ST_setItemNode (uint_fast32_t length, ST_Node2Node f, ST_Node node);
-
-
 /*ST_getBoundVariable 関数
  * 関数抽象ノードabstractionの束縛変数(Bound Variable)を数値化したものを取得する
  * ここでいう束縛変数とは、λx.Mのときの、変数xを指す*/

--- a/source_code/shadowstar.c
+++ b/source_code/shadowstar.c
@@ -1292,16 +1292,3 @@ void ST_freenode (ST_Free_Node freelist)
     free(freelist);
     freelist = NULL;
 }
-
-/*ST_setItemNode 関数
- * C言語でラムダ計算のchurch数を部分的に再現するための関数(ノード用)*/
-ST_Node ST_setItemNode (uint_fast32_t length, ST_Node2Node f, ST_Node node)
-{
-    int32_t i;
-    for (i = 0; i < length; i++)
-    {
-        /*lengthが4の場合、node = f(f(f(f(list))));*/
-        node = (*f)(node);
-    }
-    return 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
@@ -404,7 +404,7 @@ int main(int argc, char **argv)
     varlist = ST_tokenize(u8"「言葉」（世界）「「涙」（謎）愛」（謎）", tokens6);
     btr = ST_parse(freetree, tokens6, length, varlist);
     assert( ST_getBoundVariable(ST_getNodeValue(btr)) == ST_getItem(varlist, 0) );
-    assert( ST_getBoundVariable(ST_getNodeValue(ST_setItemNode(1, ST_getPreviousNode, btr))) == ST_getItem(varlist, 4) );
+    assert( ST_getBoundVariable(ST_getNodeValue(ST_getPreviousNode(btr))) == ST_getItem(varlist, 4) );
     lastvar = ST_getLastChild(btr);
     assert( ST_first(ST_getNodeValue(lastvar)) == ST_getItem(varlist, 1));
     lastvar = ST_getPreviousNode(lastvar);
@@ -609,6 +609,18 @@ printf("\n%d\n", i);
 
     ST_freelist(varlist);
     
+    init_token_length(tokens7, length);
+    varlist = ST_tokenize(u8"愛とは、「「謎」（謎）は「謎」（謎）」（謎）", tokens7);
+    btr = ST_parse(freetree, tokens7, length, varlist);
+    evalresult = ST_eval(varlist, btr);
+    assert( !ST_isEmptyNode(evalresult));
+    assert( ST_getBoundVariable(ST_getNodeValue(evalresult)) == ST_getItem(varlist, 3) );
+    assert( ST_first(ST_getNodeValue(ST_getLastChild(evalresult))) == ST_getItem(varlist, 4) );
+    evalresult = ST_getPreviousNode(evalresult);
+    assert(ST_isEmptyNode(evalresult));
+
+    ST_freelist(varlist);
+    
     ST_freenode(freetree);
     
     

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