Commit: 6585a42991cdcc40606934a01ee19472bed10961 - star (git)

Commit MetaInfo

• Revisão: 6585a42991cdcc40606934a01ee19472bed10961 (tree)
• Hora: 2017-05-03 22:42:41
• Autor: dhrname <dhrname@user...>
• Commiter: dhrname

Mensagem de Log

New the ST_pop function

Mudança Sumário

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

Diff

--- a/source_code/shadowstar.c
+++ b/source_code/shadowstar.c
@@ -578,6 +578,11 @@ ST_Stack_List ST_push (double value, ST_Stack_List stack)
  * スタックからは取り除かれる*/
 double ST_pop (ST_Stack_List stack)
 {
+    if (ST_isEmpty(*stack))
+    {
+        /*スタックリストが空リストであれば、ST_EMPTYの値である0.0を返す*/
+        return 0.0;
+    }
     /*stackの解放用変数*/
     ST_Ordered_Pair *stackfree = NULL;
     

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

--- a/source_code/startest.c
+++ b/source_code/startest.c
@@ -382,6 +382,20 @@ int main(int argc, char **argv)
     assert(ST_first(*stack) == 0);
     assert(ST_push(1, stack) == stack);
     assert(ST_first(*stack) == 1);
+    ST_push(3, stack);
+    ST_push(5, stack);
+    assert(ST_first(*stack) == 5);
+    assert(ST_first(ST_second(*stack)) == 3);
+    assert(ST_pop(stack) == 5);
+    assert(ST_first(*stack) == 3);
+    assert(ST_pop(stack) == 3);
+    assert(ST_first(*stack) == 1);
+    assert(ST_pop(stack) == 1);
+    assert(ST_first(*stack) == 0);
+    assert(ST_isEmpty(*stack));
+    assert(ST_pop(stack) == 0);
+    assert(ST_isEmpty(*stack));
+    ST_freelist(*stack);
     ST_freelist(ppp);
     
     eprint_log("Error!\n");

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