diff --git a/about.txt b/about.txt index 22266aa..68e841c 100644 --- a/about.txt +++ b/about.txt @@ -1,8 +1,8 @@ REBOL 3 Host-Kit Source Distribution From REBOL Technologies in Ukiah, California - Version: 2.100.105.0.0 (alpha) - Updated: 1-Sep-2010/9:55:48-7:00 + Version: 2.100.106.0.0 (alpha) + Updated: 8-Sep-2010/12:45:20-7:00 PURPOSE: diff --git a/lib/r3lib.dll b/lib/r3lib.dll index 9b92f21..dda4fb9 100644 Binary files a/lib/r3lib.dll and b/lib/r3lib.dll differ diff --git a/lib/r3lib.exp b/lib/r3lib.exp index b60e345..9607b4f 100644 Binary files a/lib/r3lib.exp and b/lib/r3lib.exp differ diff --git a/lib/r3lib.lib b/lib/r3lib.lib index 0da8412..285258b 100644 Binary files a/lib/r3lib.lib and b/lib/r3lib.lib differ diff --git a/make-cbp/post-build-win.cmd b/make-cbp/post-build-win.cmd new file mode 100644 index 0000000..cace0c9 --- /dev/null +++ b/make-cbp/post-build-win.cmd @@ -0,0 +1 @@ +IF NOT EXIST %1\r3lib.dll copy ..\lib\r3lib.dll %1\r3lib.dll diff --git a/make-cbp/r3.cbp b/make-cbp/r3.cbp index 925106d..2c92c9d 100644 --- a/make-cbp/r3.cbp +++ b/make-cbp/r3.cbp @@ -34,7 +34,7 @@ - + @@ -43,115 +43,118 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/make-gcc/makefile b/make-gcc/makefile index 113e17c..3b08084 100644 --- a/make-gcc/makefile +++ b/make-gcc/makefile @@ -1,7 +1,6 @@ -#--- REBOL 3.0 Host Makefile - Build A105 -#--- Note: this makefile was generated by make-build.r (1-Sep-2010/16:55:48) -#--- This file intentionally kept simple - to work on all platforms. -#--- You will need REBOL 2.6 or 2.7 in your work directory or environment path +#--- REBOL 3.0 Host Makefile - Build A106 - From make-build.r (8-Sep-2010/19:45:20) +#--- TO MAKE: copy this file to the top level (where src/ is a dir) +#--- This file intentionally kept simple... to work on all platforms. C= gcc #C= cc (an alternative) @@ -94,12 +93,12 @@ r3.exe: $(OBJS) $(GFX) $(AGG) r3lib.dll $C $(CFLAGS) -fpack-struct -o $O/host-main.o $S/os/host-main.c $C -o r3.exe $(OBJS) $(GFX) $(AGG) $(LIBS) strip r3.exe - + r3core.exe: $(OBJS) r3lib.dll - $C $(CFLAGS) -DCORE_ONLY -fpack-struct -o $O/host-main.o $S/os/host-main.c + $C $(CFLAGS) -fpack-struct -DCORE_ONLY -o $O/host-main.o $S/os/host-main.c $C -o r3core.exe $(OBJS) $(LIBS) strip r3core.exe - + r3lib.dll: lib/r3lib.dll copy lib\r3lib.dll . diff --git a/src/boot/version.r b/src/boot/version.r index 1fb3ee5..3a8dca6 100644 --- a/src/boot/version.r +++ b/src/boot/version.r @@ -1 +1 @@ -2.100.105.3.1 \ No newline at end of file +2.100.106.3.1 \ No newline at end of file diff --git a/src/include/ext-types.h b/src/include/ext-types.h index 4035cdf..915f78b 100644 --- a/src/include/ext-types.h +++ b/src/include/ext-types.h @@ -7,8 +7,8 @@ ************************************************************************ ** ** Title: Extension Types (Isolators) -** Build: A105 -** Date: 1-Sep-2010 +** Build: A106 +** Date: 8-Sep-2010 ** File: ext-types.h ** ** AUTO-GENERATED FILE - Do not modify. (From: make-boot.r) @@ -36,12 +36,12 @@ enum REBOL_Ext_Types RXT_GET_WORD, // 15 RXT_LIT_WORD, // 16 RXT_REFINEMENT, // 17 - RXT_STRING = 24, // 18 - RXT_FILE, // 19 - RXT_EMAIL, // 20 - RXT_URL, // 21 - RXT_TAG, // 22 - RXT_ISSUE, // 23 + RXT_ISSUE, // 18 + RXT_STRING = 24, // 19 + RXT_FILE, // 20 + RXT_EMAIL, // 21 + RXT_URL, // 22 + RXT_TAG, // 23 RXT_BLOCK = 32, // 24 RXT_PAREN, // 25 RXT_PATH, // 26 diff --git a/src/include/host-ext-draw.h b/src/include/host-ext-draw.h index cbec5ec..44acd63 100644 --- a/src/include/host-ext-draw.h +++ b/src/include/host-ext-draw.h @@ -7,8 +7,8 @@ ************************************************************************ ** ** Title: REBOL Graphics - DRAW commands -** Build: A105 -** Date: 1-Sep-2010 +** Build: A106 +** Date: 8-Sep-2010 ** File: host-ext-draw ** ** AUTO-GENERATED FILE - Do not modify. (From: make-host-ext.r) diff --git a/src/include/host-ext-graphics.h b/src/include/host-ext-graphics.h index 3f5b8c8..d728299 100644 --- a/src/include/host-ext-graphics.h +++ b/src/include/host-ext-graphics.h @@ -7,8 +7,8 @@ ************************************************************************ ** ** Title: REBOL Graphics -** Build: A105 -** Date: 1-Sep-2010 +** Build: A106 +** Date: 8-Sep-2010 ** File: host-ext-graphics ** ** AUTO-GENERATED FILE - Do not modify. (From: make-host-ext.r) diff --git a/src/include/host-ext-shape.h b/src/include/host-ext-shape.h index 8ac953b..1cfa088 100644 --- a/src/include/host-ext-shape.h +++ b/src/include/host-ext-shape.h @@ -7,8 +7,8 @@ ************************************************************************ ** ** Title: REBOL Graphics - SHAPE commands -** Build: A105 -** Date: 1-Sep-2010 +** Build: A106 +** Date: 8-Sep-2010 ** File: host-ext-shape ** ** AUTO-GENERATED FILE - Do not modify. (From: make-host-ext.r) diff --git a/src/include/host-ext-text.h b/src/include/host-ext-text.h index 6b3bbe7..0bb6d3d 100644 --- a/src/include/host-ext-text.h +++ b/src/include/host-ext-text.h @@ -7,8 +7,8 @@ ************************************************************************ ** ** Title: REBOL Graphics - TEXT commands -** Build: A105 -** Date: 1-Sep-2010 +** Build: A106 +** Date: 8-Sep-2010 ** File: host-ext-text ** ** AUTO-GENERATED FILE - Do not modify. (From: make-host-ext.r) diff --git a/src/include/host-init.h b/src/include/host-init.h index e1e31dc..879995c 100644 --- a/src/include/host-init.h +++ b/src/include/host-init.h @@ -7,401 +7,401 @@ ************************************************************************ ** ** Title: Host custom init code -** Build: A105 -** Date: 1-Sep-2010 +** Build: A106 +** Date: 8-Sep-2010 ** File: include/host-init.h ** ** AUTO-GENERATED FILE - Do not modify. (From: make-host-init.r) ** ***********************************************************************/ -#define REB_INIT_SIZE 3863 +#define REB_INIT_SIZE 3865 const unsigned char Reb_Init_Code[REB_INIT_SIZE] = { - 120, 156, 213, 26, 219, 146, 219, 68, 118, 159, - 245, 21, 61, 162, 168, 100, 40, 100, 203, 158, - 107, 4, 179, 83, 33, 9, 155, 173, 10, 69, - 10, 134, 39, 149, 31, 20, 169, 109, 139, 145, - 37, 35, 201, 227, 120, 9, 255, 190, 231, 214, - 173, 150, 111, 19, 2, 203, 238, 22, 49, 99, - 119, 159, 62, 125, 110, 125, 110, 221, 95, 169, - 23, 213, 114, 83, 231, 179, 121, 171, 126, 120, - 245, 205, 247, 111, 212, 157, 78, 231, 101, 85, - 84, 179, 92, 55, 106, 20, 252, 168, 151, 193, - 56, 28, 133, 195, 139, 232, 12, 254, 157, 7, - 87, 81, 24, 122, 94, 190, 88, 86, 117, 171, - 22, 85, 182, 42, 180, 138, 189, 54, 111, 11, - 29, 41, 159, 113, 156, 169, 215, 119, 119, 111, - 213, 178, 174, 218, 42, 173, 10, 213, 164, 115, - 189, 208, 190, 242, 30, 116, 221, 228, 85, 25, - 169, 112, 48, 26, 132, 202, 43, 147, 5, 172, - 154, 183, 237, 210, 155, 0, 150, 102, 83, 166, - 65, 181, 140, 212, 116, 85, 166, 42, 166, 45, - 222, 85, 217, 70, 13, 139, 42, 77, 0, 79, - 155, 180, 26, 1, 87, 101, 161, 155, 70, 33, - 192, 144, 6, 85, 92, 45, 117, 73, 3, 206, - 232, 48, 45, 170, 70, 223, 70, 106, 163, 155, - 137, 242, 104, 44, 114, 87, 241, 208, 48, 89, - 39, 247, 48, 17, 213, 58, 201, 2, 34, 130, - 70, 148, 151, 85, 188, 191, 151, 79, 121, 115, - 89, 119, 163, 158, 32, 236, 70, 197, 89, 21, - 212, 250, 151, 149, 110, 120, 95, 216, 197, 161, - 237, 86, 173, 147, 188, 85, 177, 16, 83, 149, - 165, 78, 91, 224, 95, 72, 88, 234, 116, 216, - 230, 11, 93, 173, 96, 93, 140, 82, 8, 116, - 93, 87, 181, 242, 239, 120, 212, 7, 116, 184, - 127, 164, 82, 208, 18, 115, 135, 164, 36, 69, - 129, 210, 210, 5, 160, 19, 186, 242, 114, 90, - 13, 231, 64, 19, 72, 88, 61, 121, 81, 149, - 173, 46, 219, 224, 110, 179, 180, 76, 186, 16, - 195, 62, 192, 50, 169, 27, 189, 7, 81, 31, - 44, 246, 252, 86, 191, 111, 135, 190, 106, 231, - 245, 74, 249, 95, 169, 116, 142, 11, 219, 155, - 159, 238, 190, 13, 174, 125, 111, 66, 74, 100, - 130, 219, 10, 240, 213, 121, 57, 59, 33, 9, - 194, 76, 39, 67, 214, 138, 138, 233, 175, 17, - 155, 129, 218, 210, 129, 177, 5, 253, 0, 116, - 200, 159, 147, 137, 49, 8, 18, 23, 89, 206, - 58, 111, 211, 249, 48, 211, 211, 100, 85, 180, - 138, 192, 134, 45, 83, 45, 114, 87, 162, 49, - 207, 81, 25, 195, 177, 92, 167, 73, 209, 104, - 164, 32, 171, 74, 50, 233, 122, 69, 63, 153, - 202, 238, 55, 171, 40, 230, 191, 145, 131, 66, - 108, 142, 231, 189, 253, 227, 145, 42, 17, 59, - 26, 22, 253, 22, 153, 201, 222, 136, 158, 204, - 96, 15, 235, 194, 49, 209, 74, 48, 244, 141, - 205, 145, 173, 181, 70, 35, 143, 61, 28, 143, - 122, 156, 89, 112, 177, 125, 194, 212, 216, 243, - 96, 167, 205, 161, 64, 11, 43, 55, 1, 238, - 142, 214, 122, 171, 162, 14, 132, 183, 138, 251, - 231, 102, 107, 26, 184, 48, 51, 14, 156, 58, - 170, 36, 84, 14, 252, 97, 200, 5, 254, 143, - 85, 173, 98, 4, 136, 248, 188, 41, 102, 194, - 110, 135, 218, 153, 235, 244, 30, 244, 217, 44, - 171, 18, 212, 100, 167, 80, 148, 107, 240, 63, - 250, 40, 82, 134, 216, 197, 234, 156, 117, 217, - 26, 44, 57, 48, 199, 203, 179, 180, 56, 86, - 83, 84, 213, 253, 106, 233, 250, 33, 154, 66, - 18, 197, 254, 226, 61, 104, 55, 234, 8, 117, - 102, 225, 54, 125, 174, 85, 2, 231, 145, 98, - 193, 246, 60, 20, 75, 116, 115, 148, 251, 238, - 252, 109, 99, 207, 42, 228, 215, 156, 146, 109, - 254, 13, 35, 98, 209, 136, 58, 112, 189, 215, - 143, 186, 6, 71, 175, 8, 125, 166, 58, 183, - 231, 31, 99, 150, 215, 238, 35, 198, 108, 159, - 37, 109, 130, 231, 46, 111, 231, 128, 29, 44, - 84, 197, 57, 184, 167, 153, 174, 111, 247, 249, - 174, 84, 124, 87, 161, 203, 89, 59, 223, 7, - 209, 214, 73, 217, 76, 117, 29, 232, 50, 173, - 112, 11, 240, 235, 126, 58, 95, 149, 247, 58, - 243, 39, 127, 49, 155, 160, 168, 242, 184, 186, - 200, 47, 237, 218, 234, 239, 215, 47, 255, 103, - 108, 168, 115, 38, 104, 76, 236, 144, 208, 215, - 17, 200, 22, 211, 198, 37, 121, 254, 119, 184, - 95, 82, 178, 23, 83, 83, 248, 128, 86, 250, - 97, 31, 228, 176, 128, 72, 152, 204, 200, 95, - 72, 44, 0, 223, 115, 127, 194, 252, 130, 155, - 161, 159, 183, 202, 130, 201, 151, 72, 37, 63, - 131, 5, 154, 113, 161, 131, 247, 58, 65, 87, - 204, 252, 61, 79, 83, 140, 180, 94, 158, 193, - 143, 183, 38, 217, 240, 146, 122, 54, 138, 204, - 90, 199, 169, 110, 113, 112, 55, 175, 171, 245, - 31, 100, 1, 220, 248, 182, 89, 216, 125, 93, - 225, 201, 73, 234, 54, 127, 1, 70, 221, 146, - 0, 105, 63, 115, 210, 158, 214, 186, 93, 213, - 101, 99, 98, 231, 41, 17, 208, 206, 43, 240, - 141, 235, 170, 206, 78, 204, 196, 68, 249, 175, - 6, 179, 129, 250, 199, 171, 187, 47, 213, 235, - 87, 207, 95, 126, 169, 222, 126, 255, 227, 157, - 210, 109, 58, 128, 53, 45, 200, 64, 131, 199, - 153, 230, 133, 118, 214, 252, 250, 207, 82, 165, - 9, 232, 188, 154, 154, 193, 47, 33, 32, 41, - 221, 164, 201, 18, 237, 63, 135, 188, 69, 215, - 32, 138, 5, 88, 244, 83, 13, 27, 172, 26, - 61, 93, 21, 24, 206, 43, 48, 246, 58, 207, - 116, 7, 141, 155, 157, 14, 212, 139, 164, 70, - 152, 147, 223, 64, 206, 198, 67, 136, 144, 32, - 33, 20, 206, 204, 204, 83, 200, 23, 130, 30, - 43, 106, 153, 228, 117, 131, 156, 202, 137, 85, - 49, 70, 31, 43, 238, 188, 76, 234, 205, 9, - 197, 77, 100, 193, 32, 20, 96, 192, 104, 146, - 148, 55, 124, 208, 129, 135, 148, 164, 155, 169, - 100, 213, 86, 139, 164, 205, 33, 220, 21, 27, - 160, 244, 213, 98, 217, 110, 100, 95, 64, 8, - 33, 232, 125, 146, 182, 197, 70, 21, 57, 152, - 23, 238, 48, 0, 38, 36, 210, 194, 97, 128, - 40, 69, 106, 230, 175, 17, 12, 145, 89, 66, - 254, 185, 4, 49, 145, 36, 81, 86, 74, 84, - 244, 153, 175, 128, 11, 241, 79, 40, 250, 91, - 101, 20, 81, 66, 226, 4, 217, 114, 145, 201, - 8, 158, 49, 249, 226, 249, 100, 3, 67, 72, - 136, 125, 245, 226, 135, 55, 223, 162, 233, 0, - 90, 157, 128, 75, 39, 173, 11, 197, 19, 213, - 57, 224, 90, 67, 152, 201, 132, 70, 56, 55, - 136, 153, 64, 137, 6, 225, 16, 145, 77, 36, - 243, 178, 178, 53, 82, 166, 20, 205, 8, 215, - 204, 110, 227, 245, 251, 178, 133, 4, 95, 177, - 59, 189, 181, 75, 236, 38, 201, 210, 93, 138, - 195, 202, 10, 206, 217, 74, 230, 123, 52, 245, - 151, 202, 240, 196, 44, 231, 128, 180, 123, 134, - 222, 178, 165, 110, 31, 34, 80, 1, 121, 51, - 42, 31, 192, 98, 140, 62, 49, 221, 86, 232, - 255, 185, 212, 128, 95, 81, 151, 135, 3, 61, - 48, 227, 214, 6, 20, 42, 20, 193, 153, 128, - 17, 81, 42, 27, 192, 225, 89, 88, 151, 91, - 189, 251, 25, 188, 62, 58, 37, 244, 70, 75, - 32, 207, 255, 98, 248, 5, 208, 192, 63, 131, - 23, 156, 34, 195, 240, 170, 157, 66, 146, 172, - 188, 215, 21, 50, 33, 86, 66, 232, 113, 211, - 32, 207, 212, 215, 127, 87, 215, 33, 41, 151, - 205, 140, 184, 99, 2, 96, 13, 168, 54, 242, - 123, 11, 36, 119, 236, 65, 161, 176, 126, 106, - 32, 166, 61, 159, 145, 146, 185, 34, 131, 220, - 92, 185, 156, 176, 136, 134, 253, 124, 164, 31, - 244, 61, 55, 84, 70, 36, 184, 161, 73, 179, - 130, 34, 47, 245, 246, 24, 21, 17, 153, 136, - 16, 99, 117, 36, 56, 154, 252, 95, 6, 56, - 163, 157, 232, 43, 151, 126, 156, 13, 175, 235, - 92, 210, 176, 225, 78, 169, 180, 235, 69, 153, - 19, 57, 115, 96, 89, 236, 228, 40, 122, 178, - 116, 18, 240, 2, 159, 15, 39, 125, 229, 241, - 42, 177, 45, 148, 18, 209, 27, 208, 214, 65, - 150, 39, 88, 75, 245, 11, 79, 116, 97, 202, - 49, 158, 189, 102, 195, 165, 19, 195, 198, 49, - 104, 90, 190, 179, 139, 123, 234, 144, 26, 241, - 204, 169, 250, 176, 53, 252, 100, 9, 122, 59, - 5, 138, 170, 37, 214, 138, 22, 133, 120, 239, - 15, 106, 85, 23, 96, 199, 79, 45, 115, 6, - 211, 196, 133, 102, 143, 43, 80, 157, 193, 246, - 183, 180, 227, 241, 164, 191, 186, 231, 114, 63, - 152, 195, 106, 54, 181, 46, 99, 11, 157, 29, - 71, 53, 158, 154, 172, 162, 151, 145, 247, 68, - 42, 194, 68, 237, 226, 97, 183, 254, 44, 27, - 169, 108, 172, 208, 168, 200, 54, 122, 85, 141, - 149, 252, 110, 241, 142, 120, 34, 181, 107, 49, - 124, 148, 221, 83, 220, 55, 99, 123, 8, 246, - 153, 49, 81, 113, 160, 126, 217, 241, 25, 166, - 20, 199, 88, 98, 177, 102, 144, 125, 76, 243, - 146, 83, 66, 58, 9, 16, 144, 138, 41, 200, - 20, 230, 198, 60, 55, 108, 147, 188, 64, 190, - 113, 102, 12, 83, 156, 17, 237, 57, 100, 252, - 127, 167, 156, 198, 86, 0, 152, 65, 221, 58, - 248, 1, 209, 214, 121, 181, 95, 0, 8, 86, - 174, 210, 118, 8, 69, 194, 28, 33, 229, 44, - 201, 46, 150, 108, 231, 84, 30, 61, 84, 192, - 244, 129, 20, 59, 118, 142, 251, 126, 16, 66, - 45, 73, 251, 201, 1, 152, 254, 22, 69, 210, - 180, 193, 2, 178, 243, 105, 14, 1, 61, 118, - 188, 72, 210, 182, 122, 129, 39, 6, 80, 226, - 200, 201, 254, 53, 19, 138, 35, 11, 200, 94, - 118, 132, 54, 62, 84, 232, 225, 180, 215, 181, - 114, 220, 176, 155, 176, 90, 17, 39, 102, 106, - 202, 214, 127, 84, 136, 209, 47, 187, 110, 159, - 127, 196, 2, 29, 191, 12, 209, 112, 200, 214, - 32, 146, 73, 252, 247, 85, 252, 153, 15, 73, - 192, 7, 112, 245, 35, 40, 64, 154, 106, 161, - 57, 160, 199, 30, 142, 168, 167, 251, 61, 238, - 19, 28, 62, 85, 222, 7, 5, 96, 99, 128, - 142, 253, 240, 28, 209, 248, 225, 5, 160, 57, - 180, 170, 172, 2, 145, 60, 173, 61, 4, 86, - 221, 159, 34, 127, 132, 252, 12, 73, 241, 195, - 179, 195, 164, 52, 90, 7, 21, 134, 54, 166, - 135, 8, 57, 76, 64, 167, 38, 3, 126, 113, - 24, 124, 133, 63, 234, 234, 253, 230, 40, 185, - 181, 206, 242, 26, 60, 65, 71, 244, 57, 19, - 125, 68, 126, 171, 18, 50, 197, 121, 85, 131, - 229, 90, 66, 174, 14, 131, 19, 17, 1, 46, - 57, 74, 73, 90, 228, 104, 213, 84, 22, 116, - 212, 28, 97, 176, 161, 130, 178, 183, 224, 16, - 168, 52, 82, 3, 20, 97, 3, 217, 40, 248, - 36, 32, 157, 29, 176, 180, 89, 208, 192, 14, - 88, 96, 117, 223, 213, 209, 110, 48, 189, 81, - 79, 230, 220, 135, 217, 219, 169, 32, 19, 255, - 168, 250, 180, 223, 10, 69, 87, 31, 63, 178, - 152, 183, 112, 86, 79, 76, 230, 13, 46, 140, - 34, 10, 157, 217, 126, 11, 20, 221, 46, 34, - 223, 215, 154, 181, 171, 255, 66, 130, 61, 233, - 87, 176, 5, 42, 123, 22, 254, 19, 210, 78, - 87, 13, 20, 55, 14, 1, 224, 151, 50, 152, - 8, 15, 11, 78, 74, 129, 143, 18, 157, 233, - 178, 80, 120, 227, 206, 4, 197, 180, 24, 203, - 25, 36, 123, 210, 227, 197, 99, 192, 189, 246, - 118, 227, 120, 5, 201, 201, 108, 234, 3, 216, - 88, 104, 16, 28, 109, 247, 250, 13, 100, 9, - 24, 201, 59, 70, 40, 253, 23, 169, 114, 7, - 212, 184, 122, 23, 244, 120, 187, 230, 7, 131, - 0, 211, 200, 28, 121, 95, 36, 229, 42, 41, - 40, 30, 213, 40, 92, 238, 221, 60, 34, 119, - 183, 129, 227, 244, 83, 208, 118, 58, 39, 162, - 220, 179, 175, 220, 115, 173, 58, 231, 241, 9, - 86, 65, 108, 238, 104, 117, 103, 247, 199, 68, - 241, 28, 64, 145, 95, 150, 29, 85, 194, 214, - 137, 168, 141, 110, 63, 73, 10, 216, 79, 58, - 196, 244, 35, 4, 197, 166, 151, 38, 243, 62, - 69, 198, 201, 167, 81, 225, 70, 21, 211, 168, - 254, 111, 59, 50, 207, 198, 174, 67, 167, 253, - 184, 194, 222, 194, 82, 188, 143, 251, 179, 52, - 213, 51, 194, 223, 101, 43, 9, 248, 128, 229, - 159, 76, 77, 151, 136, 252, 207, 68, 30, 242, - 100, 198, 161, 253, 177, 34, 152, 75, 220, 143, - 185, 81, 192, 196, 18, 247, 222, 27, 220, 31, - 85, 148, 244, 64, 228, 34, 68, 112, 244, 117, - 244, 9, 250, 49, 93, 226, 206, 211, 80, 147, - 24, 134, 185, 164, 137, 212, 103, 191, 134, 47, - 195, 231, 191, 241, 200, 216, 25, 114, 135, 251, - 21, 140, 0, 74, 95, 118, 187, 20, 137, 184, - 3, 244, 30, 173, 97, 187, 255, 228, 221, 153, - 158, 253, 43, 233, 217, 195, 216, 27, 204, 247, - 191, 147, 35, 207, 2, 183, 61, 35, 246, 249, - 189, 42, 212, 52, 134, 74, 189, 14, 86, 117, - 174, 98, 172, 175, 45, 113, 84, 248, 76, 220, - 186, 191, 187, 118, 222, 41, 0, 247, 20, 165, - 130, 117, 183, 240, 210, 24, 159, 97, 170, 176, - 27, 243, 50, 186, 27, 239, 10, 74, 153, 148, - 113, 236, 9, 61, 65, 41, 61, 166, 254, 95, - 109, 120, 3, 65, 39, 221, 213, 59, 8, 5, - 164, 133, 71, 107, 90, 67, 186, 64, 70, 210, - 179, 137, 223, 108, 41, 227, 214, 186, 31, 125, - 118, 123, 121, 130, 161, 157, 218, 85, 55, 78, - 235, 202, 206, 152, 86, 215, 77, 175, 145, 101, - 59, 114, 210, 222, 176, 208, 88, 116, 122, 91, - 87, 236, 221, 157, 219, 71, 71, 124, 236, 94, - 19, 153, 68, 76, 208, 101, 0, 146, 68, 205, - 193, 171, 193, 105, 158, 249, 189, 7, 1, 31, - 31, 254, 149, 19, 147, 247, 53, 60, 204, 49, - 199, 45, 41, 110, 87, 43, 72, 215, 240, 162, - 41, 192, 106, 89, 45, 238, 71, 240, 25, 171, - 182, 78, 192, 250, 106, 233, 127, 160, 59, 56, - 208, 249, 176, 39, 101, 207, 229, 255, 193, 182, - 136, 91, 161, 82, 239, 58, 54, 120, 142, 223, - 132, 225, 61, 7, 49, 214, 149, 206, 30, 48, - 208, 115, 114, 36, 42, 211, 226, 53, 45, 98, - 6, 93, 65, 240, 40, 186, 92, 167, 171, 126, - 229, 62, 143, 158, 54, 56, 194, 160, 170, 119, - 174, 223, 7, 89, 62, 203, 219, 134, 31, 27, - 152, 6, 10, 72, 138, 92, 137, 46, 51, 201, - 133, 204, 186, 126, 107, 1, 191, 55, 205, 74, - 159, 184, 152, 13, 9, 206, 208, 141, 10, 249, - 38, 170, 35, 11, 149, 17, 27, 247, 166, 158, - 138, 78, 32, 41, 241, 79, 101, 103, 168, 172, - 137, 104, 163, 46, 24, 181, 46, 205, 161, 205, - 174, 180, 158, 192, 174, 48, 205, 114, 163, 51, - 211, 87, 182, 243, 135, 163, 224, 99, 6, 122, - 184, 46, 64, 87, 174, 147, 90, 153, 238, 134, - 60, 104, 216, 163, 25, 17, 129, 163, 147, 251, - 124, 137, 22, 26, 89, 69, 56, 124, 230, 224, - 187, 193, 16, 168, 187, 66, 109, 45, 180, 110, - 99, 210, 189, 222, 11, 105, 220, 224, 82, 48, - 137, 13, 156, 205, 173, 161, 200, 188, 177, 144, - 71, 17, 230, 135, 141, 230, 251, 95, 224, 216, - 208, 41, 113, 91, 110, 132, 15, 245, 168, 60, - 199, 106, 29, 131, 22, 25, 28, 88, 245, 245, - 141, 53, 106, 187, 252, 80, 174, 98, 145, 110, - 157, 138, 179, 113, 24, 134, 127, 88, 137, 82, - 19, 217, 108, 193, 40, 242, 32, 99, 91, 176, - 18, 189, 187, 243, 21, 153, 87, 60, 202, 31, - 141, 207, 206, 47, 46, 175, 174, 159, 133, 201, - 187, 52, 211, 211, 231, 223, 188, 120, 249, 234, - 91, 95, 90, 240, 18, 144, 98, 121, 180, 197, - 81, 201, 62, 252, 122, 13, 132, 215, 119, 24, - 180, 41, 66, 19, 205, 246, 74, 246, 97, 52, - 24, 249, 166, 127, 74, 252, 54, 155, 166, 213, - 11, 20, 93, 153, 37, 117, 198, 129, 0, 231, - 131, 18, 175, 203, 60, 142, 3, 159, 15, 205, - 245, 39, 151, 138, 142, 227, 139, 39, 202, 235, - 181, 159, 145, 20, 122, 52, 21, 169, 209, 133, - 201, 224, 14, 236, 134, 49, 62, 144, 12, 111, - 43, 157, 243, 118, 82, 185, 110, 79, 147, 88, - 36, 105, 139, 241, 134, 245, 96, 239, 163, 220, - 220, 194, 61, 86, 91, 79, 105, 220, 87, 52, - 198, 176, 241, 205, 8, 91, 150, 138, 211, 4, - 107, 5, 14, 51, 230, 134, 155, 58, 101, 246, - 97, 9, 63, 28, 171, 245, 148, 203, 249, 237, - 155, 28, 74, 25, 228, 108, 244, 106, 8, 68, - 207, 101, 63, 204, 225, 211, 50, 103, 165, 233, - 119, 59, 212, 237, 198, 93, 233, 33, 216, 119, - 122, 66, 177, 132, 64, 186, 73, 217, 43, 13, - 200, 104, 147, 66, 124, 141, 112, 76, 29, 5, - 185, 253, 143, 104, 86, 206, 137, 253, 217, 93, - 72, 152, 33, 88, 78, 127, 35, 190, 116, 53, - 131, 6, 165, 96, 227, 213, 6, 18, 18, 192, - 85, 10, 63, 99, 247, 37, 27, 152, 43, 248, - 223, 66, 74, 154, 225, 251, 96, 189, 94, 7, - 136, 19, 179, 51, 138, 128, 58, 235, 30, 183, - 241, 189, 221, 132, 17, 79, 156, 148, 231, 255, - 85, 175, 123, 46, 190, 152, 70, 22, 221, 71, - 235, 253, 56, 30, 177, 10, 228, 238, 128, 81, - 56, 183, 65, 230, 61, 136, 147, 227, 196, 146, - 149, 74, 21, 130, 153, 49, 28, 191, 91, 71, - 82, 148, 204, 245, 68, 241, 29, 196, 124, 76, - 94, 104, 38, 201, 50, 56, 203, 77, 95, 32, - 110, 109, 97, 252, 118, 94, 230, 88, 95, 121, - 93, 174, 20, 41, 243, 186, 143, 61, 139, 121, - 70, 90, 86, 61, 183, 226, 230, 239, 236, 77, - 196, 125, 163, 127, 113, 30, 193, 117, 194, 247, - 250, 218, 113, 119, 228, 172, 205, 226, 197, 27, - 101, 70, 13, 248, 218, 20, 60, 237, 156, 238, - 141, 183, 216, 247, 36, 131, 118, 39, 76, 142, - 13, 238, 105, 218, 189, 89, 0, 28, 209, 112, - 200, 162, 193, 139, 100, 231, 14, 153, 67, 86, - 239, 49, 159, 152, 10, 77, 240, 115, 65, 137, - 67, 164, 80, 185, 2, 49, 61, 69, 50, 243, - 195, 126, 112, 90, 173, 202, 236, 150, 75, 4, - 71, 193, 221, 225, 216, 145, 70, 247, 58, 233, - 48, 214, 45, 107, 113, 202, 212, 61, 119, 200, - 123, 135, 13, 199, 172, 99, 215, 70, 140, 163, - 55, 12, 98, 182, 247, 184, 159, 239, 248, 219, - 211, 206, 235, 208, 115, 0, 39, 183, 244, 142, - 58, 170, 24, 79, 21, 165, 89, 25, 77, 59, - 196, 218, 231, 10, 134, 91, 78, 60, 236, 107, - 96, 250, 45, 39, 13, 78, 108, 189, 159, 74, - 123, 212, 164, 51, 135, 168, 13, 214, 221, 226, - 194, 50, 68, 208, 183, 166, 39, 231, 62, 110, - 221, 42, 188, 88, 128, 242, 158, 213, 78, 50, - 237, 76, 155, 36, 79, 143, 202, 208, 225, 113, - 39, 223, 2, 176, 208, 121, 188, 246, 174, 72, - 210, 123, 124, 72, 30, 226, 67, 242, 180, 74, - 138, 72, 93, 158, 15, 232, 159, 242, 102, 117, - 2, 178, 24, 141, 175, 7, 242, 1, 101, 234, - 117, 139, 217, 248, 232, 42, 28, 200, 7, 82, - 146, 188, 120, 160, 193, 103, 227, 129, 124, 96, - 176, 172, 214, 145, 26, 159, 135, 3, 249, 64, - 112, 155, 83, 112, 27, 95, 92, 12, 228, 131, - 20, 96, 132, 65, 2, 232, 231, 172, 214, 154, - 94, 182, 35, 0, 146, 180, 73, 236, 79, 2, - 168, 49, 155, 160, 73, 156, 222, 232, 162, 160, - 109, 4, 101, 136, 105, 22, 190, 217, 72, 12, - 16, 45, 42, 147, 135, 13, 111, 66, 76, 64, - 2, 63, 165, 215, 243, 192, 21, 172, 104, 53, - 178, 29, 118, 76, 46, 146, 186, 66, 111, 66, - 243, 8, 81, 21, 249, 131, 238, 36, 1, 35, - 203, 85, 189, 44, 180, 1, 161, 85, 21, 164, - 108, 51, 97, 111, 116, 1, 131, 180, 48, 171, - 147, 119, 145, 186, 26, 15, 224, 223, 232, 18, - 248, 173, 171, 53, 162, 62, 123, 54, 184, 124, - 6, 146, 66, 169, 79, 167, 26, 214, 93, 93, - 14, 198, 151, 3, 18, 167, 46, 75, 96, 96, - 116, 25, 14, 174, 199, 131, 243, 11, 108, 255, - 228, 139, 6, 73, 26, 143, 129, 165, 112, 112, - 9, 96, 15, 121, 85, 224, 155, 24, 64, 28, - 14, 158, 133, 136, 58, 71, 101, 142, 174, 174, - 7, 103, 231, 240, 15, 168, 204, 203, 123, 33, - 8, 84, 58, 198, 204, 121, 6, 36, 137, 188, - 194, 139, 1, 106, 165, 77, 8, 47, 144, 119, - 125, 62, 24, 157, 161, 78, 116, 110, 24, 25, - 35, 203, 207, 128, 238, 252, 161, 194, 131, 97, - 117, 135, 43, 49, 217, 195, 181, 23, 162, 227, - 51, 24, 187, 159, 39, 247, 57, 18, 1, 204, - 225, 103, 124, 137, 58, 123, 87, 21, 104, 227, - 163, 243, 49, 75, 121, 68, 214, 160, 147, 22, - 45, 4, 119, 193, 113, 144, 69, 242, 203, 10, - 24, 63, 71, 225, 193, 7, 241, 225, 27, 46, - 116, 217, 225, 224, 156, 4, 191, 78, 200, 254, - 174, 17, 4, 16, 157, 143, 49, 20, 47, 147, - 141, 40, 28, 198, 207, 174, 64, 132, 247, 104, - 184, 204, 51, 155, 192, 34, 199, 28, 151, 209, - 94, 2, 1, 76, 22, 25, 223, 217, 245, 224, - 226, 26, 209, 1, 231, 80, 209, 7, 41, 19, - 75, 75, 249, 35, 134, 38, 236, 35, 121, 227, - 208, 251, 219, 191, 1, 141, 118, 209, 130, 247, - 49, 0, 0}; + 120, 156, 213, 26, 219, 114, 219, 54, 118, 159, + 249, 21, 48, 59, 157, 196, 157, 82, 162, 100, + 249, 18, 182, 94, 79, 154, 164, 155, 157, 73, + 167, 153, 214, 125, 226, 232, 129, 33, 33, 139, + 53, 69, 170, 36, 101, 69, 219, 244, 223, 247, + 220, 0, 130, 186, 57, 77, 187, 221, 221, 105, + 84, 75, 192, 193, 193, 185, 225, 220, 128, 175, + 212, 139, 106, 185, 169, 243, 187, 121, 171, 126, + 120, 245, 205, 247, 111, 212, 173, 78, 231, 101, + 85, 84, 119, 185, 110, 212, 85, 240, 163, 94, + 6, 227, 112, 20, 14, 71, 227, 104, 50, 137, + 206, 39, 193, 101, 20, 134, 158, 151, 47, 150, + 85, 221, 170, 69, 149, 173, 10, 173, 98, 175, + 205, 219, 66, 71, 202, 103, 36, 103, 234, 245, + 237, 237, 91, 181, 172, 171, 182, 74, 171, 66, + 53, 233, 92, 47, 180, 175, 188, 7, 93, 55, + 121, 85, 70, 42, 28, 140, 6, 161, 242, 202, + 100, 1, 171, 230, 109, 187, 244, 166, 128, 165, + 217, 148, 105, 80, 45, 35, 53, 91, 149, 169, + 138, 105, 139, 119, 85, 182, 81, 195, 162, 74, + 19, 192, 211, 38, 173, 70, 192, 85, 89, 232, + 166, 81, 8, 48, 164, 65, 21, 87, 75, 93, + 210, 128, 51, 58, 76, 139, 170, 209, 55, 145, + 218, 232, 102, 170, 60, 26, 139, 220, 85, 60, + 52, 76, 214, 201, 61, 76, 68, 181, 78, 178, + 128, 136, 160, 17, 229, 101, 21, 239, 239, 229, + 51, 222, 92, 214, 93, 171, 39, 8, 187, 81, + 113, 86, 5, 181, 254, 101, 165, 27, 222, 23, + 118, 113, 104, 187, 81, 235, 36, 111, 85, 44, + 196, 84, 101, 169, 211, 22, 248, 23, 18, 150, + 58, 29, 182, 249, 66, 87, 43, 88, 23, 163, + 20, 2, 93, 215, 85, 173, 252, 91, 30, 245, + 1, 29, 238, 31, 169, 20, 212, 196, 220, 33, + 41, 73, 81, 160, 180, 116, 1, 232, 132, 174, + 188, 156, 85, 195, 57, 208, 4, 18, 86, 79, + 94, 84, 101, 171, 203, 54, 184, 221, 44, 45, + 147, 46, 196, 176, 15, 176, 76, 234, 70, 239, + 65, 212, 7, 139, 61, 191, 213, 239, 219, 161, + 175, 218, 121, 189, 82, 254, 87, 42, 157, 227, + 194, 246, 250, 167, 219, 111, 131, 43, 223, 155, + 146, 18, 153, 224, 182, 2, 124, 117, 94, 222, + 157, 144, 4, 97, 166, 147, 33, 107, 69, 197, + 244, 215, 136, 205, 64, 109, 233, 192, 216, 130, + 126, 0, 58, 228, 207, 201, 212, 24, 4, 137, + 139, 44, 103, 157, 183, 233, 124, 152, 233, 89, + 178, 42, 90, 69, 96, 195, 150, 169, 22, 185, + 43, 209, 152, 231, 168, 140, 225, 88, 174, 179, + 164, 104, 52, 82, 144, 85, 37, 153, 116, 189, + 162, 159, 76, 101, 247, 155, 85, 20, 243, 223, + 200, 65, 33, 54, 199, 243, 222, 254, 241, 72, + 149, 136, 29, 13, 139, 126, 139, 204, 100, 111, + 68, 79, 102, 176, 135, 117, 225, 152, 104, 37, + 24, 250, 198, 230, 200, 214, 90, 163, 145, 199, + 30, 142, 71, 61, 206, 44, 184, 216, 62, 97, + 106, 236, 121, 176, 211, 230, 80, 160, 133, 149, + 155, 0, 119, 71, 107, 189, 81, 81, 7, 194, + 91, 197, 253, 115, 179, 53, 13, 92, 152, 25, + 7, 78, 29, 85, 18, 42, 7, 254, 48, 228, + 2, 255, 199, 170, 86, 49, 2, 68, 124, 222, + 20, 51, 97, 183, 67, 237, 204, 117, 122, 15, + 250, 108, 150, 85, 9, 106, 178, 83, 40, 202, + 53, 248, 31, 125, 20, 41, 67, 236, 98, 117, + 206, 186, 108, 13, 150, 28, 152, 227, 229, 89, + 90, 28, 171, 41, 170, 234, 126, 181, 116, 253, + 16, 77, 33, 137, 98, 127, 241, 30, 180, 27, + 117, 132, 58, 179, 112, 155, 62, 215, 42, 129, + 243, 72, 177, 96, 123, 30, 138, 37, 186, 57, + 202, 125, 119, 254, 182, 177, 103, 21, 242, 107, + 78, 201, 54, 255, 134, 17, 177, 104, 68, 29, + 184, 222, 235, 71, 93, 131, 163, 87, 132, 62, + 83, 157, 219, 243, 143, 49, 203, 107, 247, 17, + 99, 182, 207, 146, 54, 193, 115, 151, 183, 115, + 192, 14, 22, 170, 226, 28, 220, 211, 157, 174, + 111, 246, 249, 174, 84, 124, 87, 161, 203, 187, + 118, 190, 15, 162, 173, 147, 178, 153, 233, 58, + 208, 101, 90, 225, 22, 224, 215, 253, 116, 190, + 42, 239, 117, 230, 79, 255, 98, 54, 65, 81, + 229, 113, 117, 145, 95, 218, 181, 213, 223, 175, + 95, 254, 207, 216, 80, 231, 76, 208, 152, 216, + 33, 161, 175, 35, 144, 45, 166, 141, 75, 242, + 252, 239, 112, 191, 164, 100, 47, 166, 102, 240, + 1, 173, 244, 195, 62, 200, 97, 1, 145, 48, + 185, 35, 127, 33, 177, 0, 124, 207, 253, 9, + 243, 11, 110, 134, 126, 222, 40, 11, 38, 95, + 34, 149, 252, 12, 22, 104, 198, 133, 14, 222, + 235, 4, 93, 49, 243, 247, 60, 77, 49, 210, + 122, 121, 6, 63, 222, 154, 100, 195, 75, 234, + 187, 81, 100, 214, 58, 78, 117, 139, 131, 219, + 121, 93, 173, 255, 32, 11, 224, 198, 183, 205, + 194, 238, 235, 10, 79, 78, 82, 183, 249, 11, + 48, 234, 150, 4, 72, 251, 153, 147, 246, 180, + 214, 237, 170, 46, 27, 19, 59, 79, 137, 128, + 118, 94, 129, 111, 92, 87, 117, 118, 98, 38, + 166, 202, 127, 53, 184, 27, 168, 127, 188, 186, + 253, 82, 189, 126, 245, 252, 229, 151, 234, 237, + 247, 63, 222, 42, 221, 166, 3, 88, 211, 130, + 12, 52, 120, 156, 89, 94, 104, 103, 205, 175, + 255, 44, 85, 154, 128, 206, 171, 153, 25, 252, + 18, 2, 146, 210, 77, 154, 44, 209, 254, 115, + 200, 91, 116, 13, 162, 88, 128, 69, 63, 213, + 176, 193, 170, 209, 179, 85, 129, 225, 188, 2, + 99, 175, 243, 76, 119, 208, 184, 217, 233, 64, + 189, 72, 106, 132, 57, 249, 13, 228, 108, 60, + 132, 8, 9, 18, 66, 225, 204, 204, 60, 133, + 124, 33, 232, 177, 162, 150, 73, 94, 55, 200, + 169, 156, 88, 21, 99, 244, 177, 226, 206, 203, + 164, 222, 156, 80, 220, 68, 22, 12, 66, 1, + 6, 140, 38, 73, 121, 195, 7, 29, 120, 72, + 73, 186, 153, 74, 86, 109, 181, 72, 218, 28, + 194, 93, 177, 1, 74, 95, 45, 150, 237, 70, + 246, 5, 132, 16, 130, 222, 39, 105, 91, 108, + 84, 145, 131, 121, 225, 14, 3, 96, 66, 34, + 45, 28, 6, 136, 82, 164, 102, 254, 26, 193, + 16, 153, 37, 228, 159, 75, 16, 19, 73, 18, + 101, 165, 68, 69, 159, 249, 10, 184, 16, 255, + 132, 162, 191, 81, 70, 17, 37, 36, 78, 144, + 45, 23, 153, 140, 224, 25, 147, 47, 158, 79, + 54, 48, 132, 132, 216, 87, 47, 126, 120, 243, + 45, 154, 14, 160, 213, 9, 184, 116, 210, 186, + 80, 60, 85, 157, 3, 174, 53, 132, 153, 76, + 104, 132, 115, 131, 152, 9, 148, 104, 16, 14, + 17, 217, 84, 50, 47, 43, 91, 35, 101, 74, + 209, 140, 112, 205, 236, 54, 94, 191, 47, 91, + 72, 240, 21, 187, 211, 27, 187, 196, 110, 146, + 44, 221, 165, 56, 172, 172, 224, 156, 173, 100, + 190, 71, 83, 127, 169, 12, 79, 205, 114, 14, + 72, 187, 103, 232, 45, 91, 234, 246, 33, 2, + 21, 144, 55, 163, 242, 1, 44, 198, 232, 19, + 211, 109, 133, 254, 159, 75, 13, 248, 21, 117, + 121, 56, 208, 3, 51, 110, 109, 64, 161, 66, + 17, 156, 9, 24, 17, 165, 178, 1, 28, 158, + 133, 117, 185, 213, 187, 159, 193, 235, 163, 83, + 66, 111, 180, 4, 242, 252, 47, 134, 95, 0, + 13, 252, 51, 120, 193, 41, 50, 12, 175, 218, + 25, 36, 201, 202, 123, 93, 33, 19, 98, 37, + 132, 30, 55, 13, 242, 76, 125, 253, 119, 117, + 21, 146, 114, 217, 204, 136, 59, 38, 0, 214, + 128, 106, 35, 191, 183, 64, 114, 199, 30, 20, + 10, 235, 167, 6, 98, 218, 243, 59, 82, 50, + 87, 100, 144, 155, 43, 151, 19, 22, 209, 176, + 159, 143, 244, 131, 190, 231, 134, 202, 136, 4, + 55, 52, 105, 86, 80, 228, 165, 222, 30, 163, + 34, 34, 19, 17, 98, 172, 142, 4, 71, 147, + 255, 203, 0, 103, 180, 19, 125, 229, 210, 143, + 179, 225, 117, 157, 75, 26, 54, 220, 41, 149, + 118, 189, 40, 115, 34, 103, 14, 44, 139, 157, + 28, 69, 79, 150, 78, 2, 94, 224, 243, 225, + 180, 175, 60, 94, 37, 182, 133, 82, 34, 122, + 3, 218, 58, 200, 242, 4, 107, 169, 126, 225, + 137, 46, 76, 57, 198, 179, 215, 108, 184, 116, + 98, 216, 56, 6, 77, 203, 119, 118, 113, 79, + 29, 82, 35, 158, 57, 85, 31, 182, 134, 159, + 44, 65, 111, 167, 64, 81, 181, 196, 90, 209, + 162, 16, 239, 253, 65, 173, 234, 2, 236, 248, + 169, 101, 206, 96, 154, 186, 208, 236, 113, 5, + 170, 51, 216, 254, 150, 118, 60, 158, 246, 87, + 247, 92, 238, 7, 115, 88, 205, 166, 214, 101, + 108, 161, 179, 227, 168, 198, 83, 147, 85, 244, + 50, 242, 158, 72, 69, 152, 168, 93, 60, 236, + 214, 159, 101, 35, 149, 141, 21, 26, 21, 217, + 70, 175, 170, 177, 146, 223, 45, 222, 17, 79, + 164, 118, 45, 134, 143, 178, 123, 138, 251, 102, + 108, 15, 193, 62, 51, 38, 42, 14, 212, 47, + 59, 62, 195, 148, 226, 24, 75, 44, 214, 12, + 178, 143, 89, 94, 114, 74, 72, 39, 1, 2, + 82, 49, 3, 153, 194, 220, 152, 231, 134, 109, + 146, 23, 200, 55, 206, 140, 97, 138, 51, 162, + 61, 135, 140, 255, 239, 148, 211, 216, 10, 0, + 51, 168, 91, 7, 63, 32, 218, 58, 175, 246, + 11, 0, 193, 202, 85, 218, 14, 161, 72, 152, + 35, 164, 156, 37, 217, 197, 146, 237, 156, 202, + 163, 135, 10, 152, 62, 144, 98, 199, 206, 113, + 223, 15, 66, 168, 37, 105, 63, 57, 0, 211, + 223, 162, 72, 154, 54, 88, 64, 118, 62, 203, + 33, 160, 199, 142, 23, 73, 218, 86, 47, 240, + 196, 0, 74, 28, 57, 217, 191, 102, 74, 113, + 100, 1, 217, 203, 142, 208, 198, 135, 10, 61, + 156, 246, 186, 86, 142, 27, 118, 19, 86, 43, + 226, 196, 76, 77, 217, 250, 143, 10, 49, 250, + 101, 215, 237, 243, 143, 88, 160, 227, 151, 33, + 26, 14, 217, 26, 68, 50, 137, 255, 190, 138, + 63, 243, 33, 9, 248, 0, 174, 126, 4, 5, + 72, 83, 45, 52, 7, 244, 216, 195, 17, 245, + 116, 191, 199, 125, 130, 195, 167, 202, 251, 160, + 0, 108, 12, 208, 177, 31, 78, 16, 141, 31, + 158, 3, 154, 67, 171, 202, 42, 16, 201, 211, + 218, 67, 96, 213, 253, 41, 242, 71, 200, 207, + 144, 20, 63, 60, 59, 76, 74, 163, 117, 80, + 97, 104, 99, 122, 136, 144, 195, 4, 116, 106, + 50, 224, 231, 135, 193, 87, 248, 163, 174, 222, + 111, 142, 146, 91, 235, 44, 175, 193, 19, 116, + 68, 79, 152, 232, 35, 242, 91, 149, 144, 41, + 206, 171, 26, 44, 215, 18, 114, 121, 24, 156, + 136, 8, 112, 201, 81, 74, 210, 34, 71, 171, + 166, 178, 160, 163, 230, 8, 131, 13, 21, 148, + 189, 5, 135, 64, 165, 145, 26, 160, 8, 27, + 200, 70, 193, 39, 1, 233, 236, 128, 165, 205, + 130, 6, 118, 192, 2, 171, 251, 174, 142, 118, + 131, 233, 181, 122, 50, 231, 62, 204, 222, 78, + 5, 153, 248, 71, 213, 167, 253, 86, 40, 186, + 250, 248, 145, 197, 188, 133, 179, 122, 106, 50, + 111, 112, 97, 20, 81, 232, 204, 246, 91, 160, + 232, 118, 17, 249, 190, 214, 172, 93, 253, 23, + 18, 236, 73, 191, 130, 45, 80, 217, 179, 240, + 159, 144, 118, 186, 106, 160, 184, 113, 8, 0, + 191, 148, 193, 68, 120, 88, 112, 82, 10, 124, + 148, 232, 76, 151, 133, 194, 27, 119, 38, 40, + 166, 197, 88, 206, 32, 217, 211, 30, 47, 30, + 3, 238, 181, 183, 107, 199, 43, 72, 78, 102, + 83, 31, 192, 198, 66, 131, 224, 104, 187, 215, + 111, 32, 75, 192, 72, 222, 49, 66, 233, 191, + 72, 149, 59, 160, 198, 213, 187, 160, 199, 219, + 53, 63, 24, 4, 152, 70, 230, 200, 251, 34, + 41, 87, 73, 65, 241, 168, 70, 225, 114, 239, + 230, 17, 185, 187, 13, 28, 167, 159, 130, 182, + 211, 57, 17, 229, 158, 125, 229, 158, 107, 213, + 57, 143, 79, 176, 10, 98, 115, 71, 171, 59, + 187, 63, 38, 138, 231, 0, 138, 252, 178, 236, + 168, 18, 182, 78, 68, 109, 116, 251, 73, 82, + 192, 126, 210, 33, 166, 31, 33, 40, 54, 189, + 52, 153, 247, 41, 50, 78, 63, 141, 10, 55, + 170, 152, 70, 245, 127, 219, 145, 121, 54, 118, + 29, 58, 237, 199, 21, 246, 22, 150, 226, 133, + 220, 159, 165, 169, 158, 17, 254, 46, 91, 73, + 192, 7, 44, 255, 100, 106, 186, 68, 228, 127, + 38, 242, 144, 39, 51, 14, 237, 143, 21, 193, + 92, 226, 126, 204, 141, 2, 38, 150, 184, 247, + 222, 224, 254, 168, 162, 164, 7, 34, 23, 33, + 130, 163, 175, 163, 79, 208, 143, 233, 18, 119, + 158, 134, 154, 196, 48, 204, 37, 77, 164, 62, + 251, 53, 124, 25, 62, 255, 141, 71, 198, 206, + 144, 59, 220, 175, 96, 4, 80, 250, 178, 219, + 165, 72, 196, 29, 160, 247, 104, 13, 219, 253, + 39, 239, 214, 244, 236, 95, 73, 207, 30, 198, + 222, 96, 190, 255, 157, 28, 121, 22, 184, 237, + 25, 177, 207, 239, 85, 161, 166, 49, 84, 234, + 117, 176, 170, 115, 21, 99, 125, 109, 137, 163, + 194, 103, 234, 214, 253, 221, 181, 243, 78, 1, + 184, 167, 40, 21, 172, 187, 133, 151, 198, 248, + 12, 83, 133, 221, 152, 151, 209, 221, 120, 87, + 80, 202, 164, 140, 99, 79, 232, 9, 74, 233, + 49, 245, 255, 106, 195, 27, 8, 58, 233, 174, + 222, 65, 40, 32, 45, 60, 90, 179, 26, 210, + 5, 50, 146, 158, 77, 252, 102, 75, 25, 183, + 214, 253, 232, 179, 219, 203, 19, 12, 237, 212, + 174, 186, 118, 90, 87, 118, 198, 180, 186, 174, + 123, 141, 44, 219, 145, 147, 246, 134, 133, 198, + 162, 211, 219, 186, 98, 239, 238, 220, 62, 58, + 226, 99, 247, 154, 200, 36, 98, 130, 46, 3, + 144, 36, 106, 14, 94, 13, 78, 243, 157, 223, + 123, 16, 240, 241, 225, 95, 57, 49, 121, 95, + 195, 195, 28, 115, 220, 146, 226, 118, 181, 130, + 116, 13, 47, 154, 2, 172, 150, 213, 226, 126, + 4, 159, 177, 106, 235, 4, 172, 175, 150, 254, + 7, 186, 131, 3, 157, 15, 123, 82, 246, 92, + 254, 31, 108, 139, 184, 21, 42, 245, 174, 99, + 131, 231, 248, 77, 24, 222, 115, 16, 99, 93, + 233, 236, 1, 3, 61, 39, 71, 162, 50, 45, + 94, 211, 34, 102, 208, 21, 4, 143, 162, 203, + 117, 186, 234, 87, 238, 243, 232, 105, 131, 35, + 12, 170, 122, 231, 250, 125, 144, 229, 119, 121, + 219, 240, 99, 3, 211, 64, 1, 73, 145, 43, + 209, 101, 38, 185, 144, 89, 215, 111, 45, 224, + 247, 166, 89, 233, 19, 23, 179, 33, 193, 25, + 186, 86, 33, 223, 68, 117, 100, 161, 50, 98, + 227, 222, 212, 83, 209, 9, 36, 37, 254, 169, + 236, 12, 149, 53, 17, 109, 212, 5, 163, 214, + 165, 57, 180, 217, 149, 214, 19, 216, 21, 166, + 89, 110, 116, 102, 250, 202, 118, 254, 112, 20, + 124, 204, 64, 15, 215, 5, 232, 202, 117, 82, + 43, 211, 221, 144, 7, 13, 123, 52, 35, 34, + 112, 116, 114, 159, 47, 209, 66, 35, 171, 8, + 135, 207, 28, 124, 55, 24, 2, 117, 87, 168, + 173, 133, 214, 109, 76, 186, 215, 123, 33, 141, + 27, 92, 10, 38, 177, 129, 179, 185, 49, 20, + 153, 55, 22, 242, 40, 194, 252, 176, 209, 124, + 255, 11, 28, 27, 58, 37, 110, 203, 141, 240, + 161, 30, 149, 231, 88, 173, 99, 208, 34, 131, + 3, 171, 190, 190, 182, 70, 109, 151, 31, 202, + 85, 44, 210, 173, 83, 113, 54, 14, 195, 240, + 15, 43, 81, 106, 34, 155, 45, 24, 69, 30, + 100, 108, 11, 86, 162, 119, 119, 190, 34, 243, + 138, 71, 249, 163, 241, 217, 228, 252, 226, 242, + 234, 89, 152, 188, 75, 51, 61, 123, 254, 205, + 139, 151, 175, 190, 245, 165, 5, 47, 1, 41, + 150, 71, 91, 28, 149, 236, 195, 175, 215, 64, + 120, 125, 139, 65, 155, 34, 52, 209, 108, 175, + 100, 31, 70, 131, 145, 111, 250, 167, 196, 111, + 179, 105, 90, 189, 64, 209, 149, 89, 82, 103, + 28, 8, 112, 62, 40, 241, 186, 204, 227, 56, + 240, 249, 208, 92, 127, 114, 169, 232, 56, 190, + 120, 170, 188, 94, 251, 25, 73, 161, 71, 83, + 145, 26, 157, 155, 12, 238, 192, 110, 24, 227, + 3, 201, 240, 182, 210, 57, 111, 39, 149, 235, + 246, 52, 137, 69, 146, 182, 24, 111, 88, 15, + 246, 62, 202, 205, 45, 220, 99, 181, 245, 148, + 198, 125, 69, 99, 12, 27, 223, 140, 176, 101, + 169, 56, 77, 176, 86, 224, 48, 99, 110, 184, + 169, 83, 102, 31, 150, 240, 195, 177, 90, 207, + 184, 156, 223, 190, 201, 161, 148, 65, 206, 70, + 175, 134, 64, 244, 92, 246, 195, 28, 62, 45, + 115, 86, 154, 126, 183, 67, 221, 110, 220, 149, + 30, 130, 125, 167, 39, 20, 75, 8, 164, 155, + 148, 189, 210, 128, 140, 54, 41, 196, 215, 8, + 199, 212, 81, 144, 219, 255, 136, 102, 229, 156, + 216, 159, 221, 133, 132, 25, 130, 229, 244, 55, + 226, 75, 87, 51, 104, 80, 10, 54, 94, 109, + 32, 33, 1, 92, 165, 240, 51, 118, 95, 178, + 129, 185, 130, 255, 45, 164, 164, 25, 190, 15, + 214, 235, 117, 128, 56, 49, 59, 163, 8, 168, + 179, 238, 113, 27, 223, 219, 77, 25, 241, 212, + 73, 121, 254, 95, 245, 186, 231, 226, 139, 105, + 100, 209, 125, 180, 222, 143, 227, 17, 171, 64, + 238, 14, 24, 133, 115, 27, 100, 222, 131, 56, + 57, 78, 44, 89, 169, 84, 33, 152, 25, 195, + 241, 187, 113, 36, 69, 201, 92, 79, 20, 223, + 65, 204, 199, 228, 133, 102, 146, 44, 131, 179, + 220, 244, 5, 226, 214, 22, 198, 111, 231, 101, + 142, 245, 149, 215, 229, 74, 145, 50, 175, 251, + 216, 179, 152, 103, 164, 101, 213, 115, 43, 110, + 254, 206, 222, 68, 220, 55, 250, 23, 231, 17, + 92, 39, 124, 175, 175, 29, 119, 71, 206, 218, + 44, 94, 188, 81, 102, 212, 128, 175, 77, 193, + 211, 206, 233, 222, 120, 139, 125, 79, 50, 104, + 119, 194, 228, 216, 224, 158, 102, 221, 155, 5, + 192, 17, 13, 135, 44, 26, 188, 72, 118, 238, + 144, 57, 100, 245, 30, 243, 137, 169, 208, 4, + 63, 23, 148, 56, 68, 10, 149, 43, 16, 211, + 83, 36, 51, 63, 236, 7, 103, 213, 170, 204, + 110, 184, 68, 112, 20, 220, 29, 142, 29, 105, + 116, 175, 147, 14, 99, 221, 178, 22, 167, 76, + 221, 115, 135, 188, 119, 216, 112, 204, 58, 118, + 109, 196, 56, 122, 195, 32, 102, 123, 143, 251, + 249, 142, 191, 61, 237, 188, 14, 61, 7, 112, + 114, 75, 239, 168, 163, 138, 241, 84, 81, 154, + 149, 209, 180, 67, 172, 125, 174, 96, 184, 229, + 196, 195, 190, 6, 166, 223, 114, 210, 224, 196, + 214, 251, 169, 180, 71, 77, 58, 115, 136, 218, + 96, 221, 45, 46, 44, 67, 4, 125, 99, 122, + 114, 238, 227, 214, 173, 194, 139, 5, 40, 239, + 89, 237, 36, 211, 206, 180, 73, 242, 244, 168, + 12, 29, 30, 119, 242, 45, 0, 11, 157, 199, + 107, 239, 138, 36, 189, 199, 135, 228, 33, 62, + 36, 79, 171, 164, 136, 212, 197, 100, 64, 255, + 148, 119, 87, 39, 32, 139, 209, 248, 106, 32, + 31, 80, 166, 94, 183, 152, 141, 143, 46, 195, + 129, 124, 32, 37, 201, 139, 7, 26, 124, 54, + 30, 200, 7, 6, 203, 106, 29, 169, 241, 36, + 28, 200, 7, 130, 219, 156, 130, 219, 248, 252, + 124, 32, 31, 164, 0, 35, 12, 18, 64, 63, + 239, 106, 173, 233, 101, 59, 2, 32, 73, 155, + 196, 254, 36, 128, 26, 179, 9, 154, 196, 233, + 141, 46, 10, 218, 70, 80, 134, 152, 102, 225, + 155, 141, 196, 0, 209, 162, 50, 121, 216, 240, + 38, 196, 4, 36, 240, 51, 122, 61, 15, 92, + 193, 138, 86, 35, 219, 97, 199, 228, 34, 169, + 43, 244, 38, 52, 143, 16, 85, 145, 63, 232, + 78, 18, 48, 178, 92, 213, 203, 66, 27, 16, + 90, 85, 65, 202, 118, 39, 236, 141, 206, 97, + 144, 22, 102, 117, 242, 46, 82, 151, 227, 1, + 252, 27, 93, 0, 191, 117, 181, 70, 212, 103, + 207, 6, 23, 207, 64, 82, 40, 245, 217, 76, + 195, 186, 203, 139, 193, 248, 98, 64, 226, 212, + 101, 9, 12, 140, 46, 194, 193, 213, 120, 48, + 57, 199, 246, 79, 190, 104, 144, 164, 241, 24, + 88, 10, 7, 23, 0, 246, 144, 87, 5, 190, + 137, 1, 196, 225, 224, 89, 136, 168, 115, 84, + 230, 232, 242, 106, 112, 54, 129, 127, 64, 101, + 94, 222, 11, 65, 160, 210, 49, 102, 206, 119, + 64, 146, 200, 43, 60, 31, 160, 86, 218, 132, + 240, 2, 121, 87, 147, 193, 232, 12, 117, 162, + 115, 195, 200, 24, 89, 126, 6, 116, 231, 15, + 21, 30, 12, 171, 59, 92, 137, 201, 30, 174, + 61, 23, 29, 159, 193, 216, 253, 60, 185, 207, + 145, 8, 96, 14, 63, 227, 11, 212, 217, 187, + 170, 64, 27, 31, 77, 198, 44, 229, 17, 89, + 131, 78, 90, 180, 16, 220, 5, 199, 65, 22, + 201, 47, 43, 96, 124, 130, 194, 131, 15, 226, + 195, 55, 92, 232, 178, 195, 193, 132, 4, 191, + 78, 200, 254, 174, 16, 4, 16, 77, 198, 24, + 138, 151, 201, 70, 20, 14, 227, 103, 151, 32, + 194, 123, 52, 92, 230, 153, 77, 96, 145, 99, + 142, 203, 104, 47, 128, 0, 38, 139, 140, 239, + 236, 106, 112, 126, 133, 232, 128, 115, 168, 232, + 131, 148, 137, 165, 165, 252, 17, 67, 19, 246, + 145, 188, 113, 232, 253, 237, 223, 79, 20, 209, + 185, 248, 49, 0, 0}; diff --git a/src/include/host-lib.h b/src/include/host-lib.h index 1a9aea1..8409e05 100644 --- a/src/include/host-lib.h +++ b/src/include/host-lib.h @@ -7,8 +7,8 @@ ************************************************************************ ** ** Title: Host Access Library -** Build: A105 -** Date: 1-Sep-2010 +** Build: A106 +** Date: 8-Sep-2010 ** File: host-lib.h ** ** AUTO-GENERATED FILE - Do not modify. (From: make-os-ext.r) @@ -16,8 +16,8 @@ ***********************************************************************/ -#define HOST_LIB_VER 105 -#define HOST_LIB_SUM 5782 +#define HOST_LIB_VER 106 +#define HOST_LIB_SUM 10569 #define HOST_LIB_SIZE 30 @@ -45,7 +45,7 @@ typedef struct REBOL_Host_Lib { REBINT (*os_create_thread)(CFUNC init, void *arg, REBCNT stack_size); void (*os_delete_thread)(void); void (*os_task_ready)(REBINT tid); - int (*os_create_process)(REBCHR *call, int reserved); + int (*os_create_process)(REBCHR *call, u32 flags); int (*os_browse)(REBCHR *url, int reserved); BOOL (*os_request_file)(REBRFR *fr); int (*os_call_device)(REBINT device, REBCNT command); @@ -81,7 +81,7 @@ extern void *OS_Find_Function(void *dll, char* funcname); // host-lib.c extern REBINT OS_Create_Thread(CFUNC init, void *arg, REBCNT stack_size); // host-lib.c extern void OS_Delete_Thread(void); // host-lib.c extern void OS_Task_Ready(REBINT tid); // host-lib.c -extern int OS_Create_Process(REBCHR *call, int reserved); // host-lib.c +extern int OS_Create_Process(REBCHR *call, u32 flags); // host-lib.c extern int OS_Browse(REBCHR *url, int reserved); // host-lib.c extern BOOL OS_Request_File(REBRFR *fr); // host-lib.c extern int OS_Call_Device(REBINT device, REBCNT command); // ../host-device.c diff --git a/src/include/reb-evtypes.h b/src/include/reb-evtypes.h index de420e4..ca41753 100644 --- a/src/include/reb-evtypes.h +++ b/src/include/reb-evtypes.h @@ -7,8 +7,8 @@ ************************************************************************ ** ** Title: Event Types -** Build: A105 -** Date: 1-Sep-2010 +** Build: A106 +** Date: 8-Sep-2010 ** File: reb-evtypes.h ** ** AUTO-GENERATED FILE - Do not modify. (From: make-boot.r) diff --git a/src/include/reb-lib.h b/src/include/reb-lib.h index d26aeec..db2303c 100644 --- a/src/include/reb-lib.h +++ b/src/include/reb-lib.h @@ -7,8 +7,8 @@ ************************************************************************ ** ** Title: REBOL Host and Extension API -** Build: A105 -** Date: 1-Sep-2010 +** Build: A106 +** Date: 8-Sep-2010 ** File: reb-lib.r ** ** AUTO-GENERATED FILE - Do not modify. (From: make-reb-lib.r) @@ -20,7 +20,7 @@ // for compatiblity with the reb-lib DLL (using RL_Version.) #define RL_VER 2 #define RL_REV 100 -#define RL_UPD 105 +#define RL_UPD 106 // Compatiblity with the lib requires that structs are aligned using the same // method. This is concrete, not abstract. The macro below uses struct diff --git a/src/os/win32/host-graphics.c b/src/os/win32/host-graphics.c index 2295833..9bc0b48 100644 --- a/src/os/win32/host-graphics.c +++ b/src/os/win32/host-graphics.c @@ -182,12 +182,15 @@ RL_LIB *RL; // Link back to reb-lib from embedded extensions case CMD_GRAPHICS_OFFSET_TO_CARET: if (Rich_Text) { REBINT element = 0, position = 0; - rt_offset_to_caret(Rich_Text, (REBGOB*)RXA_SERIES(frm, 1), RXA_PAIR(frm, 2), &element, &position); -// RL_Print("OTC: %d, %d\n", element, position); - REBSER* dialect = (REBSER *)GOB_CONTENT((REBGOB*)RXA_SERIES(frm, 1)); - REBSER* block = RL_MAKE_BLOCK(RL_SERIES(dialect, RXI_SER_TAIL)); + REBSER* dialect; + REBSER* block; RXIARG val, str; REBCNT n, type; + + rt_offset_to_caret(Rich_Text, (REBGOB*)RXA_SERIES(frm, 1), RXA_PAIR(frm, 2), &element, &position); +// RL_Print("OTC: %d, %d\n", element, position); + dialect = (REBSER *)GOB_CONTENT((REBGOB*)RXA_SERIES(frm, 1)); + block = RL_MAKE_BLOCK(RL_SERIES(dialect, RXI_SER_TAIL)); for (n = 0; type = RL_GET_VALUE(dialect, n, &val); n++) { if (n == element) val.index = position; RL_SET_VALUE(block, n, val, type); diff --git a/src/os/win32/host-lib.c b/src/os/win32/host-lib.c index e61aa75..bd346e8 100644 --- a/src/os/win32/host-lib.c +++ b/src/os/win32/host-lib.c @@ -524,20 +524,21 @@ static void *Task_Ready; /*********************************************************************** ** -*/ int OS_Create_Process(REBCHR *call, int reserved) +*/ int OS_Create_Process(REBCHR *call, u32 flags) /* ** Return zero on error. +** For right now, set flags to 1 for /wait. ** ***********************************************************************/ { STARTUPINFO si; PROCESS_INFORMATION pi; - REBOOL is_NT; - OSVERSIONINFO info; +// REBOOL is_NT; +// OSVERSIONINFO info; REBINT result; - GetVersionEx(&info); - is_NT = info.dwPlatformId >= VER_PLATFORM_WIN32_NT; +// GetVersionEx(&info); +// is_NT = info.dwPlatformId >= VER_PLATFORM_WIN32_NT; si.cb = sizeof(si); si.lpReserved = NULL; @@ -559,14 +560,24 @@ static void *Task_Ready; NULL, // Process security attributes NULL, // Thread security attributes FALSE, // Inherit handles - CREATE_DEFAULT_ERROR_MODE, // Creation flags + NORMAL_PRIORITY_CLASS // Creation flags + | CREATE_DEFAULT_ERROR_MODE, NULL, // Environment NULL, // Current directory &si, // Startup information &pi // Process information ); - return result; + // Wait for termination: + if (result && (flags & 1)) { + result = 0; + WaitForSingleObject(pi.hProcess, INFINITE); // check result?? + GetExitCodeProcess(pi.hProcess, (PDWORD)&result); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + } + + return result; // meaning depends on flags } diff --git a/tests/text-test3.r b/tests/text-test3.r index 0442fcc..2060f0a 100644 --- a/tests/text-test3.r +++ b/tests/text-test3.r @@ -79,13 +79,13 @@ window: view/options win [ ] down [ print [ - "otc:" otc: offset-to-caret gobt event/offset + "otc:" mold otc: offset-to-caret gobt event/offset newline - "cto:" cto: caret-to-offset gobt to-integer otc/x to-integer otc/y + "cto:" mold cto: caret-to-offset gobt otc otc/1 newline - "otc2:" offset-to-caret gobt cto + "otc2:" mold otc2: offset-to-caret gobt cto ] - caret-obj/caret: reduce [at gobt/text otc/1 at first at gobt/text otc/1 otc/2] + caret-obj/caret: reduce [otc2 otc2/1] ] alt-down [ ]