FEAT: improved dealing with automatically collected natives from C sources

Author: Oldes

src/tools/file-base.reb

@@ -103,7 +103,7 @@ core: [
 	t-vector.c
 	t-word.c
 	u-aes.c
-	u-bigint.c ;needed for RSA which is needed in TLS protocol (HTTPS)
+	u-bigint.c     ; needed for RSA which is needed in TLS protocol (HTTPS)
 	u-bincode.c
 	u-bmp.c
 	u-chacha20.c
@@ -119,7 +119,7 @@ core: [
 	u-png.c
 	u-poly1305.c
 	u-rc4.c
-	u-rsa.c    ;needed in TLS protocol (HTTPS)
+	u-rsa.c       ; needed in TLS protocol (HTTPS)
 	u-uECC.c
 	u-zlib.c
 	u-wav.c
@@ -144,12 +144,12 @@ core: [
 ]
 
 made: [
-	make-boot.reb       core/b-boot.c
-	make-headers.reb    include/tmp-funcs.h
-	make-host-ext.reb   include/host-ext-graphics.h
-	make-host-init.reb  include/host-init.h
-	make-os-ext.reb     include/host-lib.h
-	make-reb-lib.reb    include/reb-lib.h
+	make-boot.reb			core/b-boot.c
+	make-headers.reb		include/tmp-funcs.h
+	make-host-ext.reb		include/host-ext-graphics.h
+	make-host-init.reb	    include/host-init.h
+	make-os-ext.reb		    include/host-lib.h
+	make-reb-lib.reb		include/reb-lib.h
 ]
 
 os: [

src/tools/make-boot.reb

@@ -1060,10 +1060,11 @@ emit {
 
 externs: make string! 2000
 boot-booters: load %booters.reb
-boot-natives: load %natives.reb
+boot-natives: append load %natives.reb load temp-dir/tmp-natives.reb
+
 
 nats: append copy boot-booters boot-natives
-nats-collected: load temp-dir/tmp-natives.reb
+
 
 n: boot-sys
 ;while [n: find n 'native] [
@@ -1083,10 +1084,6 @@ foreach val nats [
 	]
 ]
 
-foreach [name spec] nats-collected [
-	emit-line/decl "REBNATIVE(" name ");"
-	nat-count: nat-count + 1
-]
 
 print [nat-count "natives"]
 
@@ -1097,10 +1094,7 @@ foreach val nats [
 		emit-line/code "N_" to word! val "," ;R3
 	]
 ]
-foreach [name spec] nats-collected [
-	emit-line/code "N_" name ","
-	append boot-natives make block! spec
-]
+
 emit-end
 emit newline
 

src/tools/make-headers.reb

@@ -132,9 +132,8 @@ emit-native-spec: func[
 		emit-n ["^/;-- " the-file]
 		c-file: the-file
 	]
-	emit-n ["^/" name " {"]
+	emit-n #"^/"
 	emit-n trim/head/tail detab spec-rebol
-	emit-n #"}"
 ]
 
 func-header: [
@@ -344,6 +343,7 @@ foreach word [
 ] [make-arg-enums word]
 
 acts: load %../boot/natives.reb
+append acts load temp-dir/tmp-natives.reb
 
 foreach word [
 	checksum