FEAT: Automatically collecting symbols (like SYM_PLAY) so one can use them in C code without adding new words into boot/words.r file (which is still in use)

Author: Oldes

src/tools/make-boot.r

@@ -164,17 +164,16 @@ emit-line: func [prefix word cmt /var /define /code /decl /up1 /local str][
 
 	str: any [
 		if define [rejoin [prefix str]]
-		if code   [rejoin ["    " prefix str cmt]]
+		if code   [rejoin [tab prefix str cmt]]
 		if decl   [rejoin [prefix str cmt]]
-		rejoin ["    " prefix str ","]
+		rejoin [tab prefix str ","]
 	]
 	if any [code decl] [cmt: none]
 	if cmt [
-		len: 31 - length? str
-		loop to-integer len / 4 [append str tab]
+		append/dup str #" " (31 - length? str)
 		any [
 			if define [repend str cmt]
-			if cmt [repend str ["// " cmt]]
+			if cmt    [repend str ["// " cmt]]
 		]
 	]
 	append str newline
@@ -187,7 +186,7 @@ emit-head: func [title [string!] file [file!]] [
 ]
 
 emit-end: func [/easy] [
-	if not easy [remove find/last out #","]
+	if not easy [change find/last out #"," #" "]
 	append out {^};^/}
 ]
 
@@ -720,9 +719,13 @@ emit {
 	SYM_NOT_USED = 0,
 }
 
+used-words: copy []
+
 n: 1
 foreach :type-record boot-types [
-	emit-line "SYM_" join type "_type" n
+	word: join type "_type"
+	append used-words to-c-name word
+	emit-line "SYM_" word n
 	n: n + 1
 ]
 
@@ -731,9 +734,25 @@ boot-words: load %words.r
 replace boot-words '*port-modes* load %modes.r
 
 foreach word boot-words [
+	append used-words to-c-name word
 	emit-line "SYM_" word reform [n "-" word]
 	n: n + 1
 ]
+
+if exists? %../boot/tmp-symbols.r [
+	emit {^/    // follows symbols used in C sources, but not defined in %words.r list...^/}
+
+	foreach word load %../boot/tmp-symbols.r [
+		if not find used-words word [
+			append boot-words to word! lowercase word
+			emit-line "SYM_" word form n
+			n: n + 1
+		]
+	]
+
+	delete %../boot/tmp-symbols.r
+]
+
 emit-end
 
 ;-- Generate Action Constants ------------------------------------------------

src/tools/make-headers.r

@@ -127,7 +127,11 @@ native-header: [
 	)
 ]
 
-process: func [file] [
+sym-chars: charset [#"A" - #"Z" #"_" #"0" - #"9"]
+sym-check: charset "/S"
+symbols: make block! 256
+
+process: func [file /local sym p] [
 	if verbose [?? file]
 	data: read the-file: file
 	if r3 [data: deline to-string data]
@@ -139,6 +143,21 @@ process: func [file] [
 			]
 		]
 	]
+	;collect all SYM_* uses
+	parse/all/case data [
+		any [
+			to sym-check p: [
+				  "/*" thru "*/"
+				| "//" to newline
+				| "SYM_" copy sym some sym-chars (
+					if not find sym-chars p/0 [
+						append symbols sym
+					]
+				)
+				| 1 skip
+			]
+		]
+	]
 ]
 
 emit-header "Function Prototypes" %funcs.h
@@ -160,6 +179,15 @@ foreach file files [
 	][process file]
 ]
 
+symbols: sort unique symbols ;contains all symbols (like: SYM_CALL) used in above processed C files (without the SYM_ part)
+symbols: new-line/skip symbols true 1
+
+save/header  %../boot/tmp-symbols.r symbols [
+	title:    "C Symbols"
+	purpose:  "Automaticly collected symbols from C files"
+	commment: "AUTO-GENERATED FILE - Do not modify. (From: make-headers.r)"
+
+]
 write %../boot/tmp-natives.r natives
 write %../include/tmp-funcs.h output