Skip to content

Commit 298ee37

Browse files
author
Tamas Herman
committed
Migrate extensions: *.r => *.reb & *.rx => *.rebx
1 parent 4d9840f commit 298ee37

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+232
-232
lines changed

.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
make/r3*
66
make/objs/
7-
src/boot/boot-code.r
8-
src/boot/host-init.r
7+
src/boot/boot-code.reb
8+
src/boot/host-init.reb
99
src/core/b-boot.c
1010
src/include/ext-types.h
1111
src/include/host-*

make/makefile

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# REBOL Makefile -- Generated by make-make.r (do not edit) on 18-Aug-2013/15:25:30-7:00
1+
# REBOL Makefile -- Generated by make-make.reb (do not edit) on 18-Aug-2013/15:25:30-7:00
22
# This makefile is intentional kept simple to make builds possible on
33
# a wider range of target platforms.
44

55
# To regenerate this file:
66
# make make
77

8-
# To generate this file for a different platform, check systems.r file
8+
# To generate this file for a different platform, check systems.reb file
99
# and provide an OS_ID (from the systems table). Linux 2.5 for example:
1010
# make make OS_ID=0.4.3
1111

@@ -64,7 +64,7 @@ update:
6464
-cd $(UP)/; cvs -q update src
6565

6666
make:
67-
$(REBOL) $T/make-make.r $(OS_ID)
67+
$(REBOL) $T/make-make.reb $(OS_ID)
6868

6969
clean:
7070
@-rm -rf libr3.so objs/
@@ -77,12 +77,12 @@ all:
7777
$(MAKE) host$(BIN_SUFFIX)
7878

7979
prep:
80-
$(REBOL) $T/make-headers.r
81-
$(REBOL) $T/make-boot.r $(OS_ID)
82-
$(REBOL) $T/make-host-init.r
83-
$(REBOL) $T/make-os-ext.r # ok, but not always
84-
$(REBOL) $T/make-host-ext.r
85-
$(REBOL) $T/make-reb-lib.r
80+
$(REBOL) $T/make-headers.reb
81+
$(REBOL) $T/make-boot.reb $(OS_ID)
82+
$(REBOL) $T/make-host-init.reb
83+
$(REBOL) $T/make-os-ext.reb # ok, but not always
84+
$(REBOL) $T/make-host-ext.reb
85+
$(REBOL) $T/make-reb-lib.reb
8686

8787
### Provide more info if make fails due to no local Rebol build tool:
8888
tmps: $S/include/tmp-bootdefs.h
@@ -108,16 +108,16 @@ purge:
108108

109109
test:
110110
$(CP) r3$(BIN_SUFFIX) $(UP)/src/tests/
111-
$(R3) $S/tests/test.r
111+
$(R3) $S/tests/test.reb
112112

113113
install:
114114
sudo cp r3$(BIN_SUFFIX) /usr/local/bin
115115

116116
ship:
117-
$(R3) $S/tools/upload.r
117+
$(R3) $S/tools/upload.reb
118118

119119
build: libr3.so
120-
$(R3) $S/tools/make-build.r
120+
$(R3) $S/tools/make-build.reb
121121

122122
cln:
123123
rm libr3.* r3.o
@@ -186,8 +186,8 @@ host$(BIN_SUFFIX): $(HOST)
186186
echo "export LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH"
187187

188188
### File build targets:
189-
b-boot.c: $(SRC)/boot/boot.r
190-
$(REBOL) -sqw $(SRC)/tools/make-boot.r
189+
b-boot.c: $(SRC)/boot/boot.reb
190+
$(REBOL) -sqw $(SRC)/tools/make-boot.reb
191191

192192
objs/a-constants.o: $R/a-constants.c
193193
$(CC) $R/a-constants.c $(RFLAGS) -o objs/a-constants.o

make/makefile.vc

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ REBOL= r3-make.exe -qs
2929
all: prep r3.exe
3030

3131
prep:
32-
$(REBOL) $T/make-headers.r
33-
$(REBOL) $T/make-boot.r $(OS_ID)
34-
$(REBOL) $T/make-host-init.r
35-
$(REBOL) $T/make-os-ext.r # ok, but not always
36-
$(REBOL) $T/make-host-ext.r
37-
$(REBOL) $T/make-reb-lib.r
32+
$(REBOL) $T/make-headers.reb
33+
$(REBOL) $T/make-boot.reb $(OS_ID)
34+
$(REBOL) $T/make-host-init.reb
35+
$(REBOL) $T/make-os-ext.reb # ok, but not always
36+
$(REBOL) $T/make-host-ext.reb
37+
$(REBOL) $T/make-reb-lib.reb
3838

3939
objs:
4040
mkdir objs
File renamed without changes.
File renamed without changes.

src/boot/draw.r src/boot/draw.reb

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ REBOL [
1212
Name: draw
1313
Type: extension
1414
Exports: none
15-
Note: "Run make-host-ext.r to convert"
15+
Note: "Run make-host-ext.reb to convert"
1616
]
1717

1818
;don't change order of already defined words unless you know what you are doing
File renamed without changes.

src/boot/graphics.r src/boot/graphics.reb

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ REBOL [
1111
}
1212
Name: graphics
1313
Type: extension
14-
Exports: [] ; added by make-host-ext.r
15-
Note: "Run make-host-ext.r to convert"
14+
Exports: [] ; added by make-host-ext.reb
15+
Note: "Run make-host-ext.reb to convert"
1616
]
1717

1818
words: [
File renamed without changes.
File renamed without changes.

src/boot/ops.r src/boot/ops.reb

File renamed without changes.
File renamed without changes.

src/boot/root.r src/boot/root.reb

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ typesets ; block of TYPESETs used by system; expandable
2727
noneval ; NONE value
2828
noname ; noname function word
2929

30-
boot ; boot block defined in boot.r (GC'd after boot is done)
30+
boot ; boot block defined in boot.reb (GC'd after boot is done)
3131
script ; final boot script
3232

src/boot/shape.r src/boot/shape.reb

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ REBOL [
1212
Name: shape
1313
Type: extension
1414
Exports: none
15-
Note: "Run make-host-ext.r to convert"
15+
Note: "Run make-host-ext.reb to convert"
1616
]
1717

1818
;don't change order of already defined words unless you know what you are doing
File renamed without changes.
File renamed without changes.

src/boot/task.r src/boot/task.reb

File renamed without changes.

src/boot/text.r src/boot/text.reb

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ REBOL [
1212
Name: text
1313
Type: extension
1414
Exports: none
15-
Note: "Run make-host-ext.r to convert"
15+
Note: "Run make-host-ext.reb to convert"
1616
]
1717

1818
;don't change order of already defined words unless you know what you are doing
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/core/a-lib.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ extern int Do_Callback(REBSER *obj, u32 name, RXIARG *args, RXIARG *result);
312312
Append_Byte(text, 0);
313313

314314
#ifdef DUMP_INIT_SCRIPT
315-
f = _open("host-boot.r", _O_CREAT | _O_RDWR, _S_IREAD | _S_IWRITE );
315+
f = _open("host-boot.reb", _O_CREAT | _O_RDWR, _S_IREAD | _S_IWRITE );
316316
_write(f, STR_HEAD(text), LEN_BYTES(STR_HEAD(text)));
317317
_close(f);
318318
#endif

src/core/b-init.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ extern const REBYTE Str_Banner[];
555555
**
556556
*/ static void Init_System_Object()
557557
/*
558-
** The system object is defined in boot.r.
558+
** The system object is defined in boot.reb.
559559
**
560560
***********************************************************************/
561561
{
@@ -753,7 +753,7 @@ static REBCNT Set_Option_Word(REBCHR *str, REBCNT field)
753753
**
754754
*/ static void Init_Main_Args(REBARGS *rargs)
755755
/*
756-
** The system object is defined in boot.r.
756+
** The system object is defined in boot.reb.
757757
**
758758
***********************************************************************/
759759
{

src/core/c-port.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ SCHEME_ACTIONS *Scheme_Actions; // Initial Global (not threaded)
611611
**
612612
** In order to add a port scheme:
613613
**
614-
** In mezz-ports.r add a make-scheme.
614+
** In mezz-ports.reb add a make-scheme.
615615
** Add an Init_*_Scheme() here.
616616
** Be sure host-devices.c has the device enabled.
617617
**

src/core/d-crash.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ enum Crash_Msg_Nums {
8484

8585
// "REBOL PANIC #nnn: put error message here"
8686
// The first few error types only print general error message.
87-
// Those errors > RP_STR_BASE have specific error messages (from boot.r).
87+
// Those errors > RP_STR_BASE have specific error messages (from boot.reb).
8888
if (id < RP_BOOT_DATA) n = CM_DEBUG;
8989
else if (id < RP_INTERNAL) n = CM_BOOT;
9090
else if (id < RP_ASSERTS) n = CM_INTERNAL;
9191
else if (id < RP_DATATYPE) n = CM_ASSERT;
9292
else if (id < RP_STR_BASE) n = CM_DATATYPE;
9393
else if (id > RP_STR_BASE + RS_MAX - RS_ERROR) n = CM_DEBUG;
9494

95-
// Use the above string or the boot string for the error (in boot.r):
95+
// Use the above string or the boot string for the error (in boot.reb):
9696
msg = (REBYTE*)(n >= 0 ? Crash_Msgs[n] : BOOT_STR(RS_ERROR, id - RP_STR_BASE - 1));
9797
Form_Var_Args(buf + LEN_BYTES(buf), CRASH_BUF_SIZE - 1 - LEN_BYTES(buf), msg, args);
9898

src/core/m-gc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ static void Mark_Series(REBSER *series, REBCNT depth);
190190

191191
case REB_DATATYPE:
192192
if (VAL_TYPE_SPEC(val)) { // allow it to be zero
193-
CHECK_MARK(VAL_TYPE_SPEC(val), depth); // check typespec.r file
193+
CHECK_MARK(VAL_TYPE_SPEC(val), depth); // check typespec.reb file
194194
}
195195
break;
196196

src/core/p-dir.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@
8989
**
9090
** Patterns:
9191
** abc/ is true
92-
** abc/*.r is true
93-
** abc/?.r is true
92+
** abc/*.reb is true
93+
** abc/?.reb is true
9494
** abc - ask the file system
9595
**
9696
***********************************************************************/
@@ -299,7 +299,7 @@
299299
//Trap_Security(flags[POL_WRITE], POL_WRITE, path);
300300
SET_NONE(state);
301301
Init_Dir_Path(&dir, path, 0, POL_WRITE);
302-
// !!! add *.r deletion
302+
// !!! add *.reb deletion
303303
// !!! add recursive delete (?)
304304
result = OS_DO_DEVICE(&dir, RDC_DELETE);
305305
///OS_FREE(dir.file.path);

src/include/sys-globals.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
//-- Bootstrap variables:
3030
PVAR REBINT PG_Boot_Phase; // To know how far in the boot we are.
3131
PVAR REBINT PG_Boot_Level; // User specified startup level
32-
PVAR REBYTE **PG_Boot_Strs; // Special strings in boot.r (RS_ constants)
32+
PVAR REBYTE **PG_Boot_Strs; // Special strings in boot.reb (RS_ constants)
3333

3434
//-- Various statistics about memory, etc.
3535
PVAR REB_STATS *PG_Reb_Stats;

src/include/sys-panics.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@
2929
enum reb_panics {
3030

3131
// Boot Errors (very limited environment avaliable)
32-
RP_BOOT_DATA = 1000, // no boot.r text found
32+
RP_BOOT_DATA = 1000, // no boot.reb text found
3333
RP_REBVAL_ALIGNMENT, // not aligned perfectly in memory
3434
RP_BAD_SIZE, // expected size did not match
3535
RP_NO_BUFFER, // buffer not yet allocated
3636
RP_BAD_BOOT_STRING, // boot strings area is invalid
3737
RP_BAD_BOOT_TYPE_BLOCK, // boot block is wrong size
3838
RP_BAD_END_TYPE_WORD, // the end word is not correct
3939
RP_ACTION_OVERFLOW, // more actions than we should have
40-
RE_NATIVE_BOOT, // bad boot.r native ordering
40+
RE_NATIVE_BOOT, // bad boot.reb native ordering
4141
RP_EARLY_ERROR, // error before error handling
4242
RP_BAD_END_CANON_WORD, // END was not found
4343
RP_BAD_TRUE_CANON_WORD, // TRUE was not found
@@ -81,7 +81,7 @@ enum reb_panics {
8181
// Datatype Errors (300 + N --indicates location)
8282
RP_DATATYPE = 1300,
8383

84-
// Documented Errors (keep in-sync with error strings in boot.r!)
84+
// Documented Errors (keep in-sync with error strings in boot.reb!)
8585
RP_STR_BASE = 1400,
8686
RP_NO_MEMORY, // not enough memory: %d bytes
8787
RP_BAD_WIDTH, // invalid series width: %d %d %d

src/include/sys-scan.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
***********************************************************************/
2828

2929
/*
30-
** Tokens returned by the scanner. Keep in sync with boot.r strings area.
30+
** Tokens returned by the scanner. Keep in sync with boot.reb strings area.
3131
*/
3232
enum Value_Types {
3333
TOKEN_EOF = 0,
File renamed without changes.
File renamed without changes.

src/mezz/base-defs.r src/mezz/base-defs.reb

+4-4
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ foreach [codec handler] system/codecs [
7070

7171
; Special import case for extensions:
7272
append system/options/file-types switch/default fourth system/version [
73-
3 [[%.rx %.dll extension]] ; Windows
74-
2 [[%.rx %.dylib %.so extension]] ; OS X
75-
4 7 [[%.rx %.so extension]] ; Other Posix
76-
] [[%.rx extension]]
73+
3 [[%.rebx %.dll extension]] ; Windows
74+
2 [[%.rebx %.dylib %.so extension]] ; OS X
75+
4 7 [[%.rebx %.so extension]] ; Other Posix
76+
] [[%.rebx extension]]
7777

7878
internal!: make typeset! [
7979
end! unset! frame! handle!
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/mezz/boot-files.r

-54
This file was deleted.

0 commit comments

Comments
 (0)