Commit: ecdfc31b43580b7ecba270a10e36ce8c4f1f19ac - star (git)

Commit MetaInfo

• Revisão: ecdfc31b43580b7ecba270a10e36ce8c4f1f19ac (tree)
• Hora: 2018-05-13 22:53:14
• Autor: dhrname <dhrname@user...>
• Commiter: dhrname

Mensagem de Log

Add the ST_copyNode function

Mudança Sumário

• 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

Diff

--- a/source_code/orderedpair/list/tree/nodelist/ntree.h
+++ b/source_code/orderedpair/list/tree/nodelist/ntree.h
@@ -34,3 +34,8 @@ ST_Node ST_getLastChild(ST_Node);
 /*ST_getPreviewNode 関数
  * 引数で指定されたノードにとって、前隣りのノードを取得*/
 ST_Node ST_getPreviewNode(ST_Node);
+
+/*ST_copyNode 関数
+ * 引数で指定されたノードのコピーを作成
+ * 子ノードも含めてコピーする*/
+ST_Node ST_copyNode(ST_Node);

--- a/source_code/shadowstar.c
+++ b/source_code/shadowstar.c
@@ -963,3 +963,15 @@ ST_Node ST_getPreviewNode(ST_Node node)
 {
     return ST_getSecondTree(node);
 }
+
+/*ST_copyNode 関数
+ * 引数で指定されたノードのコピーを作成
+ * 子ノードも含めてコピーする*/
+ST_Node ST_copyNode(ST_Node node)
+{
+    if (ST_isEmpty(node))
+    {
+        return ST_EMPTY;
+    }
+    return ST_createNode(ST_getNodeValue(node), ST_getLastChild(node), ST_getPreviewNode(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
@@ -677,10 +677,18 @@ int main(int argc, char **argv)
     assert( ST_getLastChild(node4) == node2);
     assert( ST_getLastChild(node4) != node3);
     assert( ST_getPreviewNode(node4) == node3);
+    ST_Node node5 = ST_copyNode(node4);
+    assert( ST_isEmpty(ST_copyNode(ST_EMPTY)) );
+    assert( ST_getNodeValue(node5) == node);
+    assert( ST_getNodeValue(node5) != node2);
+    assert( ST_getLastChild(node5) == node2);
+    assert( ST_getLastChild(node5) != node3);
+    assert( ST_getPreviewNode(node5) == node3);
     ST_freetree(node);
     ST_freetree(node2);
     ST_freetree(node3);
     ST_freetree(node4);
+    ST_freetree(node5);
     
     errno = 0;
     eprint_log("Error!\n");
@@ -752,6 +760,14 @@ int tests_invalid() {
     assert(ST_isEmpty(ST_reverse(NULL)));
     assert(ST_isEmpty(ST_reverse(ST_EMPTY)));
     
+    ST_createNode(NULL, ST_EMPTY, ST_EMPTY);
+    ST_createNode(ST_EMPTY, NULL, ST_EMPTY);
+    ST_createNode(ST_EMPTY, ST_EMPTY, NULL);
+    
+    assert( ST_isEmpty(ST_getNodeValue(NULL)) );
+    assert( ST_isEmpty(ST_getLastChild(NULL)) );
+    assert( ST_isEmpty(ST_getPreviewNode(NULL)) );
+    
     printf("ended error test...\n");
     
     return 0;

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