version 10.4.5

CHANGELOG

@@ -1,4 +1,8 @@
 
+version 10.4.5
+
+    Faster compile speed.
+
 version 10.4.4
 
     Finished to implement C-FFI on JIT.

README.md

@@ -1,6 +1,6 @@
 # clover2 computer language
 
-version 10.4.4
+version 10.4.5
 
 サポートしている機能
 

TODO

@@ -17,3 +17,5 @@ C FFI C関数でi8*だけじゃなくてi32*の引数も渡せるか。
 array終わったかな。
 
 struct
+
+クラスファイルでアライメント

debian/changelog

@@ -1,4 +1,8 @@
 
+clover2 (10.4.5-1) unstable; urgency=medium
+
+    * Faster compile speed.
+
 clover2 (10.4.4-1) unstable; urgency=medium
 
     * Finished to implement C-FFI on JIT.

debian/control

@@ -3,7 +3,7 @@ Section: unknown
 Priority: optional
 Maintainer: Daisuke Minato <[email protected]>
 Build-Depends: debhelper (>= 9), autotools-dev, libpcre3-dev, libreadline-dev, clang, libreadline7
-Standards-Version: 10.4.4
+Standards-Version: 10.4.5
 Homepage: https://github.com/ab25cq/clover2/wiki
 Vcs-Git: https://github.com/ab25cq/clover2.git
 

debian/files

@@ -1,3 +1,3 @@
-clover2-dbgsym_10.4.4-1_amd64.deb debug extra
-clover2_10.4.4-1_amd64.buildinfo unknown optional
-clover2_10.4.4-1_amd64.deb unknown optional
+clover2-dbgsym_10.4.5-1_amd64.deb debug extra
+clover2_10.4.5-1_amd64.buildinfo unknown optional
+clover2_10.4.5-1_amd64.deb unknown optional

manual/changelog-en.md

@@ -1,4 +1,8 @@
 
+version 10.4.5
+
+    Faster compile speed.
+
 version 10.4.4
 
     Finished to implement C-FFI on JIT.

manual/changelog.md

@@ -1,5 +1,9 @@
 English page is here [>> English page](changelog-en)
 
+version 10.4.5
+
+    Faster compile speed.
+
 version 10.4.4
 
     Finished to implement C-FFI on JIT.

src/alignment.c

@@ -4,3 +4,12 @@ void alignment(unsigned int* size)
 {
     *size = (*size + 3) & ~3;
 }
+
+void alignment_pointer(char** p, char* head)
+{
+    unsigned int len = *p - head;
+
+    alignment(&len);
+
+    *p = head + len;
+}

src/buffer.c

@@ -45,6 +45,19 @@ void sBuf_append(sBuf* self, void* str, size_t size)
     MFREE(str2);
 }
 
+void sBuf_append_fast(sBuf* self, void* str, size_t size)
+{
+    if(self->mSize <= self->mLen + size + 1) {
+        self->mSize = (self->mLen + size + 1) * 2;
+        self->mBuf = MREALLOC(self->mBuf, sizeof(char)*self->mSize);
+    }
+
+    memcpy(self->mBuf + self->mLen, str, size);
+
+    self->mLen += size;
+    self->mBuf[self->mLen] = 0;
+}
+
 /*
 void sBuf_append(sBuf* self, void* str, size_t size)
 {

src/clover2-buffer.h

@@ -14,6 +14,7 @@ typedef struct sBufStruct sBuf;
 
 void sBuf_init(sBuf* self);
 void sBuf_append(sBuf* self, void* str, size_t size);
+void sBuf_append_fast(sBuf* self, void* str, size_t size);
 void sBuf_append_char(sBuf* self, char c);
 void sBuf_append_str(sBuf* self, char* str);
 void sBuf_append_int(sBuf* self, int value);

src/common.h

@@ -460,8 +460,10 @@ typedef struct sCLClassStruct sCLClass;
 void class_init();
 void class_final();
 
-BOOL read_block_from_file(int fd, sCLBlockObject* block_object);
-BOOL read_from_file(int fd, void* buf, size_t size);
+BOOL read_file(char* fname, sBuf* source);
+BOOL read_block_from_file(char** p, sCLBlockObject* block_object, char* head);
+BOOL read_from_file(char** p, void* buf, size_t size, char* head);
+BOOL read_char_from_file(char** p, char* c);
 void reset_js_load_class();
 sCLClass* get_class_with_load(char* class_name, BOOL js);
 sCLClass* get_class(char* class_name, BOOL js);
@@ -2031,9 +2033,9 @@ void dependency_final();
 void append_block_to_buffer(sBuf* buf, sCLBlockObject* block_object);
 void append_byte_codes_to_buffer(sBuf* buf, sByteCode* code);
 void append_const_to_buffer(sBuf* buf, sConst* constant);
-BOOL read_code_from_file(int fd, sByteCode* code);
-BOOL read_int_from_file(int fd, int* n);
-BOOL read_const_from_file(int fd, sConst* constant);
+BOOL read_code_from_file(char** p, sByteCode* code, char* head);
+BOOL read_int_from_file(char** p, int* n);
+BOOL read_const_from_file(char** p, sConst* constant, char* head);
 void add_native_code_to_method(sCLMethod* method, sBuf* native_code);
 BOOL add_method_to_class(sCLClass* klass, char* method_name, sParserParam* params, int num_params, sNodeType* result_type, BOOL native_, BOOL static_, BOOL dynamic_, BOOL pure_native_, sGenericsParamInfo* ginfo, sCLMethod** appended_method, char* clibrary_path, sParserInfo* info);
 int add_block_object_to_class(sCLClass* klass, sByteCode codes, sConst constant, int var_num, int num_params, BOOL lambda);
@@ -2623,6 +2625,7 @@ extern CLObject signal_handler_object[SIGMAX];
 
 /// alignment.c ///
 void alignment(unsigned int* size);
+void alignment_pointer(char** p, char* head);
 
 /// clover_to_clang ///
 ALLOC wchar_t* string_object_to_wchar_array(CLObject string_object);

src/compiler.c

@@ -149,7 +149,7 @@ static BOOL class_compiler(char* fname)
 
 int gARGC;
 char** gARGV;
-char* gVersion = "10.4.4";
+char* gVersion = "10.4.5";
 
 char gScriptDirPath[PATH_MAX];
 BOOL gRunningCompiler = TRUE;

src/get_type.c

@@ -223,7 +223,7 @@ static BOOL is_shell_mode(char* source, char* fname, sVarTable* lv_table)
 
 int gARGC;
 char** gARGV;
-char* gVersion = "10.4.4";
+char* gVersion = "10.4.5";
 
 char gScriptDirPath[PATH_MAX];
 BOOL gRunningCompiler = FALSE;

src/interpreter.c

@@ -2294,7 +2294,7 @@ static void compiler_final()
 
 int gARGC;
 char** gARGV;
-char* gVersion = "10.4.4";
+char* gVersion = "10.4.5";
 
 char gScriptDirPath[PATH_MAX];
 BOOL gRunningCompiler = FALSE;

src/jit.cpp

@@ -4944,51 +4944,72 @@ static BOOL compile_jit_methods(sCLClass* klass)
 
 static BOOL read_script(char* fname, sByteCode* code, sConst* constant, int* var_num, int* param_num)
 {
-    int fd = open(fname, O_RDONLY);
+    sBuf buf;
 
-    if(fd < 0) {
-        fprintf(stderr, "%s doesn't exist(1)\n", fname);
+    sBuf_init(&buf);
+
+    if(!read_file(fname, &buf)) {
+        MFREE(buf.mBuf);
         return FALSE;
     }
 
-    /// magic number ///
+    char* p = buf.mBuf;
+
     char c;
-    if(!read_from_file(fd, &c, 1) || c != 10) { close(fd); return FALSE; }
-    if(!read_from_file(fd, &c, 1) || c != 12) { close(fd); return FALSE; }
-    if(!read_from_file(fd, &c, 1) || c != 34) { close(fd); return FALSE; }
-    if(!read_from_file(fd, &c, 1) || c != 55) { close(fd); return FALSE; }
-    if(!read_from_file(fd, &c, 1) || c != 'C') { close(fd); return FALSE; }
-    if(!read_from_file(fd, &c, 1) || c != 'L') { close(fd); return FALSE; }
-    if(!read_from_file(fd, &c, 1) || c != 'O') { close(fd); return FALSE; }
-    if(!read_from_file(fd, &c, 1) || c != 'V') { close(fd); return FALSE; }
-    if(!read_from_file(fd, &c, 1) || c != 'E') { close(fd); return FALSE; }
-    if(!read_from_file(fd, &c, 1) || c != 'R') { close(fd); return FALSE; }
-
-    if(!read_int_from_file(fd, var_num)) {
-        close(fd);
+
+    read_char_from_file(&p, &c);
+    if(c != 10) { return FALSE; }
+
+    read_char_from_file(&p, &c);
+    if(c != 12) { return FALSE; }
+
+    read_char_from_file(&p, &c);
+    if(c != 34) { return FALSE; }
+
+    read_char_from_file(&p, &c);
+    if(c != 55) { return FALSE; }
+
+    read_char_from_file(&p, &c);
+    if(c != 'C') { return FALSE; }
+
+    read_char_from_file(&p, &c);
+    if(c != 'L') { return FALSE; }
+
+    read_char_from_file(&p, &c);
+    if(c != 'O') { return FALSE; }
+
+    read_char_from_file(&p, &c);
+    if(c != 'V') { return FALSE; }
+
+    read_char_from_file(&p, &c);
+    if(c != 'E') { return FALSE; }
+
+    read_char_from_file(&p, &c);
+    if(c != 'R') { return FALSE; }
+
+    alignment_pointer(&p, buf.mBuf);
+
+    if(!read_int_from_file(&p, var_num)) {
         fprintf(stderr, "Clover2 can't read variable number\n");
         return FALSE;
     }
 
     *param_num = *var_num;
 
-    if(!read_code_from_file(fd, code))
+    if(!read_code_from_file(&p, code, buf.mBuf))
     {
-        close(fd);
         fprintf(stderr, "Clover2 can't read variable number\n");
         return FALSE;
     }
 
-    if(!read_const_from_file(fd, constant))
+    if(!read_const_from_file(&p, constant, buf.mBuf))
     {
-        close(fd);
         fprintf(stderr, "Clover2 can't read variable number\n");
         return FALSE;
     }
 
     int n;
-    if(!read_int_from_file(fd, &n)) {
-        close(fd);
+    if(!read_int_from_file(&p, &n)) {
         fprintf(stderr, "Clover2 can't read variable number\n");
         return FALSE;
     }
@@ -4997,17 +5018,14 @@ static BOOL read_script(char* fname, sByteCode* code, sConst* constant, int* var
     for(i=0; i<n; i++) {
         sCLBlockObject block_object;
 
-        if(!read_block_from_file(fd, &block_object)) {
-            close(fd);
+        if(!read_block_from_file(&p, &block_object, buf.mBuf)) {
             fprintf(stderr, "Clover2 can't read variable number\n");
             return FALSE;
         }
 
         add_block_object_to_script2(&block_object);
     }
 
-    close(fd);
-
     return TRUE;
 }
 

src/jit_main.cpp

@@ -45,7 +45,7 @@ void set_signal()
 
 int gARGC;
 char** gARGV;
-char* gVersion = "10.4.4";
+char* gVersion = "10.4.5";
 BOOL gCompilingCore = FALSE;
 
 char gScriptDirPath[PATH_MAX];