Commit: 130519fe65a1ca30febaf958c841c56e7e714dae - star (git)

Commit MetaInfo

• Revision: 130519fe65a1ca30febaf958c841c56e7e714dae (tree)
• Zeit: 2018-11-16 23:33:51
• Autor: dhrname <dhrname@user...>
• Commiter: dhrname

Log Message

Modify the ST_parse function

Ändern Zusammenfassung

• 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
@@ -474,9 +474,6 @@ ST_Node ST_parse(ST_Token_Mode *array, size_t length, ST_Ordered_Pair *list)
     
     /*変数seqが空ノードに初期化されるので、この変数にキャッシュしておく*/
     ST_Node seq_cache = ST_createNode(ST_EMPTY_NODE);
-    
-    /*seqをルートノードの末子ノードとして初期化*/
-    seq = ST_insertBefore(seq, ST_createNode(ST_EMPTY_NODE), ST_EMPTY_NODE);
 
     for (int_fast32_t i=length-1; i>=0; i--)
     {

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

--- a/source_code/startest.c
+++ b/source_code/startest.c
@@ -289,12 +289,12 @@ int main(int argc, char **argv)
     varlist = ST_tokenize(u8"aBa愛", tokens1);
     assert(ST_isEmptyNode(ST_parse(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_isEmpty(ST_parse(tokens2, length, varlist)));
+    assert(ST_isEmptyNode(ST_parse(tokens2, length, varlist)));
     assert(ST_first(ST_second(varlist)) != ST_first(varlist));
     ST_freelist(varlist);
     init_token(tokens2);
@@ -303,14 +303,14 @@ int main(int argc, char **argv)
     tokens2[5] = 0;
     tokens2[6] = 0;
     varlist = ST_tokenize(u8"「愛あ」（愛）", tokens2);
-    assert(!ST_isEmpty(ST_parse(tokens2, length, varlist)));
+    assert(!ST_isEmptyNode(ST_parse(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_isEmpty(ST_parse(tokens3, length, varlist)));
+    assert(!ST_isEmptyNode(ST_parse(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));
@@ -319,7 +319,7 @@ int main(int argc, char **argv)
     ST_Token_Mode tokens4[12] = {0};
     length = sizeof(tokens4) / sizeof(tokens4[0]);
     varlist = ST_tokenize(u8"「愛」（愛）「愛」（愛）", tokens4);
-    assert(!ST_isEmpty(ST_parse(tokens4, length, varlist)));
+    assert(!ST_isEmptyNode(ST_parse(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 +330,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_isEmpty(ST_parse(tokens5, length, varlist)));
+    assert(!ST_isEmptyNode(ST_parse(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));

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