Merge pull request #8 from Oldes/master

Update to version 3.5.6

Author: Oldes

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: [oldes]
+patreon: oldes
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: oldes
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/diagram.svg

@@ -161,6 +161,38 @@ jobs:
 #      - name: Build 64bit Rebol/Core as a host application
 #        run: ./siskin make/rebol3.nest %host-core-x64-osx
 
+      - name: Install the Apple certificate
+      # https://docs.github.com/en/actions/guides/installing-an-apple-certificate-on-macos-runners-for-xcode-development
+        env:
+          BUILD_CERTIFICATE_BASE64: ${{ secrets.MACOS_CERTIFICATE }}
+          P12_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PWD }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+        run: |
+          # create variables
+          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
+          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
+
+          # import certificate from secrets
+          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH
+
+          # create temporary keychain
+          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+
+          # import certificate to keychain
+          security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
+          security list-keychain -d user -s $KEYCHAIN_PATH
+    
+      - name: Codesign executables
+        env: 
+          MACOS_IDENTITY_ID: ${{ secrets.MACOS_IDENTITY_ID }}
+        run: | 
+          /usr/bin/codesign --force -s $MACOS_IDENTITY_ID ./build/rebol3-base-x64-osx -v
+          /usr/bin/codesign --force -s $MACOS_IDENTITY_ID ./build/rebol3-core-x64-osx -v
+          /usr/bin/codesign --force -s $MACOS_IDENTITY_ID ./build/rebol3-bulk-x64-osx -v
+          
+          
       - name: Prepare 64bit Rebol/Base for upload
         run: |
           mv ./build/rebol3-base-x64-osx ./rebol3-base-x64-osx
@@ -186,4 +218,4 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: Rebol-64bit-osx-${{github.run_id}}
-          path: ./*.gz
+          path: ./*.gz

.github/workflows/build-all.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install Siskin Builder
-        uses: oldes/install-siskin@v0.3.5
+        uses: oldes/install-siskin@v0.3.7
 
       - name: List some directories
         run: |

.github/workflows/build-arm64.yml

@@ -0,0 +1,15 @@
+name: Create diagram
+on:
+  workflow_dispatch: {}
+jobs:
+  get_data:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@master
+      - name: Update diagram
+        uses: githubocto/repo-visualizer@main
+        with:
+          excluded_paths: ".github"
+          output_file: .github/diagram.svg
+          excluded_globs: '.gitattributes,.editorconfig,.gitignore'

.github/workflows/diagram.yml

@@ -7,6 +7,7 @@ make/host.exe
 make/libr3.so
 make/libr3.dll
 make/Rebol3.xcworkspace/
+make/*.xcodeproj
 src/boot/boot-code.reb
 src/boot/host-init.reb
 src/boot/gen-natives.reb

.gitignore

@@ -112,6 +112,7 @@ target:   any [spec/target spec/os-target spec/configuration]
 os-base:  'win32
 product:  any [spec/product 'Core]
 configs:  unique any [spec/config copy []]
+stack-size: any [spec/stack-size 1048576] ;default 1MiB
 
 
 unless target [

make/pre-make.r3

@@ -1,8 +1,8 @@
 101 ICON "icon/r3.ico"
 
 1 VERSIONINFO
-FILEVERSION     3,5,5,0
-PRODUCTVERSION  3,5,5,0
+FILEVERSION     3,5,6,0
+PRODUCTVERSION  3,5,6,0
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN

make/r3-view.rc

@@ -1,8 +1,8 @@
 101 ICON "icon/r3.ico"
 
 1 VERSIONINFO
-FILEVERSION     3,5,5,0
-PRODUCTVERSION  3,5,5,0
+FILEVERSION     3,5,6,0
+PRODUCTVERSION  3,5,6,0
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN

make/r3.rc

@@ -16,10 +16,10 @@ include:  %src/include/
 temp:     %make/tmp/
 ;output:   %build/
 
-stack-size: 4194304
+stack-size: 4194304 ;= 4MB (4 * 1024 * 1024)
 optimize:   2
 
-version: 3.5.5
+version: 3.5.6
 
 core-files: [
 	%core/a-constants.c
@@ -109,7 +109,7 @@ core-files: [
 	%core/t-pair.c
 	%core/t-port.c
 	%core/t-string.c
-;	%core/t-struct.c          ;not implemented
+	%core/t-struct.c
 	%core/t-time.c
 	%core/t-tuple.c
 	%core/t-typeset.c
@@ -296,6 +296,7 @@ config: [ ;- this is list of configuration (optional) defines
 
 	;SERIES_LABELS ; used for special debug purposes
 	;SHOW_SIZEOFS  ; for debugging ports to some new systems
+	;SHOW_EXPAND_STACK ; will print info when stack expands
 	;NDEBUG        ; removes some asserts
 	;TEST_SCAN
 	;_DEBUG
@@ -331,20 +332,33 @@ include-image-os-codec: [
 	#if Windows? [
 		config: INCLUDE_IMAGE_OS_CODEC
 		host-files: %os/win32/host-image.c
-		mezz-lib-files: %mezz/codec-image.reb
+		mezz-lib-files: %mezz/codec-image-win.reb
+	]
+	#if MacOS? [
+		config: INCLUDE_IMAGE_OS_CODEC
+		host-files: [
+			%os/osx/host-image.c
+			%os/osx/sys-codecs.m
+			%os/osx/sys-utils.m
+		]
+		frameworks: [CoreGraphics CoreImage ImageIO Foundation]
+		mezz-lib-files: %mezz/codec-image-osx.reb
 	]
 ]
 
 include-image-codecs: [
 	#if Windows? [
 		:include-image-os-codec
 	]
-	#if Posix? [
+	#if Linux? [
 		:include-native-bmp-codec
 		:include-native-png-codec
 		:include-native-jpg-codec
 		:include-native-gif-codec
 	]
+	#if MacOS? [
+		:include-image-os-codec
+	]
 ]
 
 ;- native devices:                                                              
@@ -354,6 +368,14 @@ include-clipboard: [
 		core-files: %core/p-clipboard.c
 		host-files: %os/win32/dev-clipboard.c
 	]
+	#if macOS? [
+		config:     INCLUDE_CLIPBOARD
+		core-files: %core/p-clipboard.c
+		host-files: %os/osx/dev-clipboard.c
+		host-files: %os/osx/sys-clipboard.m
+		host-files: %os/osx/sys-utils.m
+		framework:  AppKit
+	]
 ]
 include-midi: [
 	#if Windows? [
@@ -364,7 +386,7 @@ include-midi: [
 	]
 	#if macOS? [
 		core-files: %core/p-midi.c
-		host-files: %os/posix/dev-midi-osx.c
+		host-files: %os/osx/dev-midi.c
 		config:     INCLUDE_MIDI_DEVICE
 		frameworks: [CoreServices CoreMIDI]
 

make/rebol3.nest

@@ -1178,6 +1178,9 @@ emit-head "Build configuration" %config.h
 
 emit {^/#ifndef REBOL_OPTIONS_H^/}
 
+if stack-size [
+	emit ajoin ["#define STACK_SIZE " stack-size lf lf]
+]
 foreach def configs [
 	emit ajoin ["#define " def lf]
 ]

make/tools/make-boot.reb

@@ -208,7 +208,7 @@ find: action [
 	/last {Backwards from end of series}
 	/reverse {Backwards from the current position}
 	/tail {Returns the end of the series}
-	/match {Performs comparison and returns the tail of the match}
+	/match {Performs comparison and returns the head of the match (not imply /tail)}
 ]
 
 select: action [
@@ -311,7 +311,7 @@ remove: action [
 
 change: action [
 	{Replaces element(s); returns just past the change.}
-	series [series! gob! port!]{At position (modified)}
+	series [series! gob! port! struct!]{At position (modified)}
 	value [any-type!] {The new value}
 	/part {Limits the amount to change to a given length or position}
 	length [number! series! pair!]

src/boot/actions.reb

@@ -34,12 +34,12 @@ catalog: object [
 	errors:  none
 	; Reflectors are used on boot to create *-of functions
 	reflectors: [
-		spec   [any-function! any-object! vector! datatype!]
+		spec   [any-function! any-object! vector! datatype! struct!]
 		body   [any-function! any-object! map!]
 		words  [any-function! any-object! map! date!]
-		values [any-object! map!]
+		values [any-object! map! struct!]
 		types  [any-function!]
-		title  [any-function! datatype!]
+		title  [any-function! datatype! module!]
 	]
 	; Official list of system/options/flags that can appear.
 	; Must match host reb-args.h enum!
@@ -86,7 +86,8 @@ state: object [
 			0.0.0
 		extension: 2.2.2 ; execute only
 	]
-	last-error: none ; used by WHY?
+	last-error:  none ; used by WHY?
+	last-result: none ; used to store last console result
 ]
 
 modules: []

src/boot/sysobj.reb

@@ -99,7 +99,7 @@ REBOL [
 	gob         self        gob         *        *       *      *   -  
 	event       self        event       *        *       *      *   -  
 	handle      self        0           -        -       -      -   -  
-	struct      invalid     0           -        -       -      -   -  
+	struct      self        struct      *        *       *      *   -  
 	library     invalid     0           -        -       -      -   -  
 	utype       self        utype       -        -       -      -   -  
 

src/boot/types.reb

@@ -27,25 +27,38 @@ any-object!
 any-block!
 
 ;- numeric types (used for "short" vector! construction)
-;- like: #[ui8! 4] which is same like: make vector! [unsigned integer! 8 4]
+;- like: #[u8! 4] which is same like: make vector! [unsigned integer! 8 4]
 ;  these numeric files are used in l-types.c and t-vector.c sources
 ;  and can be used for future struct! and routine! implementations
-si8!
-si16!
-si32!
-si64!
+i8!
+i16!
+i32!
+i64!
 
-ui8!
-ui16!
-ui32!
-ui64!
+u8!
+u16!
+u32!
+u64!
 
 f32!
 f64!
-;@@ O: Should be supported also longer variants like uint8! etc?
-; end of numeric types
 
-datatypes
+int8!
+int16!
+int32!
+int64!
+
+uint8!
+uint16!
+uint32!
+uint64!
+
+float!
+double!
+byte!
+; end of numeric types (code in l-types.c expects, that next word is `datatypes`)
+
+datatypes 
 
 native
 self
@@ -130,6 +143,7 @@ any
 opt
 not
 and
+ahead
 then
 remove
 insert

src/boot/words.reb

@@ -449,6 +449,7 @@ extern int Do_Callback(REBSER *obj, u32 name, RXIARG *args, RXIARG *result);
 	REBVAL *top = DS_VALUE(dsp+1);
 	REBOL_STATE state;
 	REBVAL *types;
+	REBVAL *last;
 
 	if (dsp != 0) Debug_Fmt(Str_Stack_Misaligned, dsp);
 
@@ -487,7 +488,9 @@ extern int Do_Callback(REBSER *obj, u32 name, RXIARG *args, RXIARG *result);
 			}
 		}
 	}
-
+	// store last result in system/state/last-result
+	last = Get_System(SYS_STATE, STATE_LAST_RESULT);
+	*last = *top;
 	POP_STATE(state, Saved_State);
 	DSP = 0;
 }

src/core/a-lib.c

@@ -755,7 +755,7 @@ extern const REBYTE Str_Banner[];
 #ifdef INCLUDE_PNG_CODEC
 	Init_PNG_Codec();
 #endif
-#ifdef USE_JPG_CODEC
+#ifdef INCLUDE_JPG_CODEC
 	Init_JPEG_Codec();
 #endif
 #ifdef INCLUDE_WAV_CODEC

src/core/b-init.c

@@ -105,7 +105,9 @@ static REBVAL *Func_Word(REBINT dsf)
 	}
 	Extend_Series(DS_Series, amount);
 	DS_Base = BLK_HEAD(DS_Series);
+#ifdef SHOW_EXPAND_STACK
 	Debug_Fmt(BOOT_STR(RS_STACK, 0), DSP, SERIES_REST(DS_Series));
+#endif
 }
 
 
@@ -861,7 +863,7 @@ x*/	static REBINT Do_Args_Light(REBVAL *func, REBVAL *path, REBSER *block, REBCN
 
 	//CHECK_MEMORY(1);
 	CHECK_STACK(&value);
-	if ((DSP + 20) > (REBINT)SERIES_REST(DS_Series)) Expand_Stack(STACK_MIN); //Trap0(RE_STACK_OVERFLOW);
+	if ((DSP + 200) > (REBINT)SERIES_REST(DS_Series)) Expand_Stack(STACK_MIN); //Trap0(RE_STACK_OVERFLOW); 
 	if (--Eval_Count <= 0 || Eval_Signals) Do_Signals();
 
 	value = BLK_SKIP(block, index);

src/core/c-do.c

@@ -119,7 +119,7 @@
 
 /***********************************************************************
 **
-*/	void Init_Handles()
+*/	void Init_Handles(void)
 /*
 **		Creates handles table
 **
@@ -139,4 +139,4 @@
 #ifdef INCLUDE_CRYPTOGRAPHY
 	Init_Crypt(); // old crypt code handles
 #endif
-}
+}