コミット: db481e755ad34c73cd77ad6b42f2100026cbd8c3 - star (git)

コミットメタ情報

• リビジョン: db481e755ad34c73cd77ad6b42f2100026cbd8c3 (tree)
• 日時: 2019-03-05 23:01:22
• 作者: dhrname <dhrname@user...>
• コミッター: dhrname

ログメッセージ

Modify the Makefile

変更サマリ

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

差分

--- a/source_code/Makefile
+++ b/source_code/Makefile
@@ -2,8 +2,7 @@ CC = gcc
 DEBUGMODE = -Wall -std=c11 -O0 -g -pg
 NODEBUGMODE = -Wall -std=c11 -O2
 SHELL = /bin/sh
-.SUFFIXES:
-.SUFFIXES: .c .o
+HEADERS = shadowstar.h star.h orderedpair/exception.h orderedpair/pair.h orderedpair/list/item.h orderedpair/list/tree/btree.h orderedpair/list/tree/nodelist/ntree.h
 
 all : startest star
 .PHONY : all
@@ -11,15 +10,13 @@ all : startest star
 %.o : %.c
 	$(CC) $(NODEBUGMODE) -c $< -o $@
 
-star.o: star.c shadowstar.h star.h orderedpair/exception.h orderedpair/pair.h orderedpair/list/item.h orderedpair/list/tree/btree.h orderedpair/list/tree/nodelist/ntree.h
+star.o: $(HEADERS)
 
-shadowstar.o: shadowstar.c shadowstar.h star.h orderedpair/exception.h orderedpair/pair.h orderedpair/list/item.h orderedpair/list/tree/btree.h orderedpair/list/tree/nodelist/ntree.h
+shadowstar.o: $(HEADERS)
 
 star: shadowstar.o star.o
 	$(CC) $(NODEBUGMODE) -o ../$@ shadowstar.o star.o
 
-startest.o: startest.c
-
 startest: shadowstar.o startest.o
 	$(CC) $(NODEBUGMODE) -o ../$@ shadowstar.o startest.o
 	

--- a/source_code/shadowstar.c
+++ b/source_code/shadowstar.c
@@ -1359,6 +1359,11 @@ static inline ST_Token_Mode* alloca_tokens(uint_fast64_t filelength)
     return s;
 }
 
+static inline uint64_t pair (uint64_t x, uint64_t y)
+{
+    return (((x+y) * (x+y+1) / 2 ) + x + 1);
+}
+
 /*ST_main 関数
  * 引数sはソースコードの文字列。
  * 引数filelengthはsの長さ

--- a/source_code/star.h
+++ b/source_code/star.h
@@ -32,3 +32,5 @@
 #include "orderedpair/list/item.h"
 
 #include "orderedpair/list/tree/nodelist/ntree.h"
+
+#include "class/class.h"

--- a/source_code/startest.c
+++ b/source_code/startest.c
@@ -819,6 +819,14 @@ printf("\n%d\n", i);
     che = "testsuite/f.st";
     assert( tests_file_length == ST_readFile(che, tests_callback_file) );
     ST_readFile(che, ST_main);
+    tests_file_length = 0;
+    che = "testsuite/g.st";
+    assert( tests_file_length == ST_readFile(che, tests_callback_file) );
+    ST_readFile(che, ST_main);
+    tests_file_length = 0;
+    che = "testsuite/h.st";
+    assert( tests_file_length == ST_readFile(che, tests_callback_file) );
+    ST_readFile(che, ST_main);
     
     elapsed = clock() - before;
     printf("Time is %.3f seconds\n", elapsed/CLOCKS_PER_SEC);

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