From 1cd285bcaa8112272ddb46fe641204599c08cbc6 Mon Sep 17 00:00:00 2001
From: "U-SLAVA-DFB8FF805\\Slava" <Slava@slava-dfb8ff805.(none)>
Date: Wed, 28 Jan 2009 01:57:14 -0600
Subject: [PATCH 1/4] Slots with declared type of callable or quotation now
have an initial value [ ]
---
core/slots/slots.factor | 1 +
1 file changed, 1 insertion(+)
mode change 100644 => 100755 core/slots/slots.factor
diff --git a/core/slots/slots.factor b/core/slots/slots.factor
old mode 100644
new mode 100755
index f166378d9d..24ff1b0f8b
--- a/core/slots/slots.factor
+++ b/core/slots/slots.factor
@@ -151,6 +151,7 @@ M: class initial-value* no-initial-value ;
{ [ array bootstrap-word over class<= ] [ { } ] }
{ [ byte-array bootstrap-word over class<= ] [ B{ } ] }
{ [ simple-alien bootstrap-word over class<= ] [ <bad-alien> ] }
+ { [ quotation bootstrap-word over class<= ] [ [ ] ] }
[ dup initial-value* ]
} cond nip ;
From 49875b9cc7db5c1c514d0a85f8d3ed0917fc67d9 Mon Sep 17 00:00:00 2001
From: "U-SLAVA-DFB8FF805\\Slava" <Slava@slava-dfb8ff805.(none)>
Date: Wed, 28 Jan 2009 01:57:46 -0600
Subject: [PATCH 2/4] Use factor.exe or factor.com when deploying on Windows,
depending on whether or not the UI is enabled
---
basis/tools/deploy/backend/backend.factor | 2 +-
basis/tools/deploy/macosx/macosx.factor | 2 +-
basis/tools/deploy/unix/unix.factor | 2 +-
basis/tools/deploy/windows/windows.factor | 23 ++++++++++++++---------
4 files changed, 17 insertions(+), 12 deletions(-)
mode change 100644 => 100755 basis/tools/deploy/backend/backend.factor
mode change 100644 => 100755 basis/tools/deploy/macosx/macosx.factor
mode change 100644 => 100755 basis/tools/deploy/unix/unix.factor
diff --git a/basis/tools/deploy/backend/backend.factor b/basis/tools/deploy/backend/backend.factor
old mode 100644
new mode 100755
index 636e44062e..22d6eb2ffa
--- a/basis/tools/deploy/backend/backend.factor
+++ b/basis/tools/deploy/backend/backend.factor
@@ -11,7 +11,7 @@ tools.deploy.config.editor bootstrap.image io.encodings.utf8
destructors accessors ;
IN: tools.deploy.backend
-: copy-vm ( executable bundle-name extension -- vm )
+: copy-vm ( executable bundle-name -- vm )
[ prepend-path ] dip append vm over copy-file ;
: copy-fonts ( name dir -- )
diff --git a/basis/tools/deploy/macosx/macosx.factor b/basis/tools/deploy/macosx/macosx.factor
old mode 100644
new mode 100755
index 91b4d603af..8fe31ac6cc
--- a/basis/tools/deploy/macosx/macosx.factor
+++ b/basis/tools/deploy/macosx/macosx.factor
@@ -54,7 +54,7 @@ IN: tools.deploy.macosx
} cleave
]
[ create-app-plist ]
- [ "Contents/MacOS/" append-path "" copy-vm ] 2tri
+ [ "Contents/MacOS/" append-path copy-vm ] 2tri
dup OCT: 755 set-file-permissions ;
: deploy.app-image ( vocab bundle-name -- str )
diff --git a/basis/tools/deploy/unix/unix.factor b/basis/tools/deploy/unix/unix.factor
old mode 100644
new mode 100755
index 9e0bb8ac68..c9bf308357
--- a/basis/tools/deploy/unix/unix.factor
+++ b/basis/tools/deploy/unix/unix.factor
@@ -8,7 +8,7 @@ IN: tools.deploy.unix
: create-app-dir ( vocab bundle-name -- vm )
dup "" copy-fonts
- "" copy-vm
+ copy-vm
dup OCT: 755 set-file-permissions ;
: bundle-name ( -- str )
diff --git a/basis/tools/deploy/windows/windows.factor b/basis/tools/deploy/windows/windows.factor
index 7ce635b1ba..0e9146b26e 100755
--- a/basis/tools/deploy/windows/windows.factor
+++ b/basis/tools/deploy/windows/windows.factor
@@ -1,9 +1,9 @@
-! Copyright (C) 2007, 2008 Slava Pestov.
+! Copyright (C) 2007, 2009 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
-USING: io io.files io.directories kernel namespaces sequences system
-tools.deploy.backend tools.deploy.config
-tools.deploy.config.editor assocs hashtables prettyprint
-combinators windows.shell32 windows.user32 ;
+USING: io io.files io.pathnames io.directories kernel namespaces
+sequences locals system splitting tools.deploy.backend
+tools.deploy.config tools.deploy.config.editor assocs hashtables
+prettyprint combinators windows.shell32 windows.user32 ;
IN: tools.deploy.windows
: copy-dll ( bundle-name -- )
@@ -15,13 +15,18 @@ IN: tools.deploy.windows
"resource:zlib1.dll"
} swap copy-files-into ;
+:: copy-vm ( executable bundle-name extension -- vm )
+ vm "." split1-last drop extension append
+ bundle-name executable ".exe" append append-path
+ [ copy-file ] keep ;
+
: create-exe-dir ( vocab bundle-name -- vm )
dup copy-dll
deploy-ui? get [
- dup copy-freetype
- dup "" copy-fonts
- ] when
- ".exe" copy-vm ;
+ [ copy-freetype ]
+ [ "" copy-fonts ]
+ [ ".exe" copy-vm ] tri
+ ] [ ".com" copy-vm ] if ;
M: winnt deploy*
"resource:" [
From 5af6c10eedfd8eb348b04ce5b614495da6dc4469 Mon Sep 17 00:00:00 2001
From: "U-SLAVA-DFB8FF805\\Slava" <Slava@slava-dfb8ff805.(none)>
Date: Wed, 28 Jan 2009 01:58:03 -0600
Subject: [PATCH 3/4] Fix io.launcher.windows.nt test when run from factor.exe
---
basis/io/launcher/windows/nt/nt-tests.factor | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
mode change 100644 => 100755 basis/io/launcher/windows/nt/nt-tests.factor
diff --git a/basis/io/launcher/windows/nt/nt-tests.factor b/basis/io/launcher/windows/nt/nt-tests.factor
old mode 100644
new mode 100755
index 4dd0eebed3..04202365fd
--- a/basis/io/launcher/windows/nt/nt-tests.factor
+++ b/basis/io/launcher/windows/nt/nt-tests.factor
@@ -37,11 +37,12 @@ IN: io.launcher.windows.nt.tests
"out.txt" temp-file ascii file-lines first
] unit-test
-[ ] [
+[ "( scratchpad ) " ] [
<process>
console-vm "-run=listener" 2array >>command
+closed+ >>stdin
- try-process
+ +stdout+ >>stderr
+ ascii [ input-stream get contents ] with-process-reader
] unit-test
: launcher-test-path ( -- str )
@@ -162,3 +163,5 @@ IN: io.launcher.windows.nt.tests
"append-test" temp-file ascii file-contents
] unit-test
+
+
From a4a6885189bb7a432d4c78638975f7b6a1c9564d Mon Sep 17 00:00:00 2001
From: "U-SLAVA-DFB8FF805\\Slava" <Slava@slava-dfb8ff805.(none)>
Date: Wed, 28 Jan 2009 01:58:57 -0600
Subject: [PATCH 4/4] Fix setters for value struct slots and add unit test for
this case; this fixes an io.mmap regression on Windows
---
basis/alien/arrays/arrays.factor | 2 +-
basis/alien/c-types/c-types.factor | 26 +++++++++++++-----------
basis/alien/structs/structs-tests.factor | 15 ++++++++++++++
basis/alien/structs/structs.factor | 12 +++++++++--
4 files changed, 40 insertions(+), 15 deletions(-)
mode change 100644 => 100755 basis/alien/arrays/arrays.factor
mode change 100644 => 100755 basis/alien/c-types/c-types.factor
mode change 100644 => 100755 basis/alien/structs/structs-tests.factor
mode change 100644 => 100755 basis/alien/structs/structs.factor
diff --git a/basis/alien/arrays/arrays.factor b/basis/alien/arrays/arrays.factor
old mode 100644
new mode 100755
index 8253d9458c..6a182f8dbf
--- a/basis/alien/arrays/arrays.factor
+++ b/basis/alien/arrays/arrays.factor
@@ -26,7 +26,7 @@ M: array box-return drop "void*" box-return ;
M: array stack-size drop "void*" stack-size ;
-M: array c-type-boxer-quot drop f ;
+M: array c-type-boxer-quot drop [ ] ;
M: array c-type-unboxer-quot drop [ >c-ptr ] ;
diff --git a/basis/alien/c-types/c-types.factor b/basis/alien/c-types/c-types.factor
old mode 100644
new mode 100755
index a4bc3d3f52..a44b5cf2b6
--- a/basis/alien/c-types/c-types.factor
+++ b/basis/alien/c-types/c-types.factor
@@ -4,7 +4,7 @@ USING: byte-arrays arrays assocs kernel kernel.private libc math
namespaces make parser sequences strings words assocs splitting
math.parser cpu.architecture alien alien.accessors quotations
layouts system compiler.units io.files io.encodings.binary
-accessors combinators effects continuations fry call ;
+accessors combinators effects continuations fry call classes ;
IN: alien.c-types
DEFER: <int>
@@ -13,18 +13,20 @@ DEFER: *char
: little-endian? ( -- ? ) 1 <int> *char 1 = ; foldable
TUPLE: c-type
-class
-boxer boxer-quot unboxer unboxer-quot
-getter setter
-reg-class size align stack-align? ;
-
-: new-c-type ( class -- type )
- new
- int-regs >>reg-class
- object >>class ; inline
+{ class class initial: object }
+boxer
+{ boxer-quot callable }
+unboxer
+{ unboxer-quot callable }
+{ getter callable }
+{ setter callable }
+{ reg-class initial: int-regs }
+size
+align
+stack-align? ;
: <c-type> ( -- type )
- \ c-type new-c-type ;
+ \ c-type new ;
SYMBOL: c-types
@@ -224,7 +226,7 @@ M: f byte-length drop 0 ;
TUPLE: long-long-type < c-type ;
: <long-long-type> ( -- type )
- long-long-type new-c-type ;
+ long-long-type new ;
M: long-long-type unbox-parameter ( n type -- )
c-type-unboxer %unbox-long-long ;
diff --git a/basis/alien/structs/structs-tests.factor b/basis/alien/structs/structs-tests.factor
old mode 100644
new mode 100755
index ec0c01c2e7..8bc570c448
--- a/basis/alien/structs/structs-tests.factor
+++ b/basis/alien/structs/structs-tests.factor
@@ -42,3 +42,18 @@ C-UNION: barx
[ ] [ \ foox-x "help" get execute ] unit-test
[ ] [ \ set-foox-x "help" get execute ] unit-test
] when
+
+C-STRUCT: nested
+ { "int" "x" } ;
+
+C-STRUCT: nested-2
+ { "nested" "y" } ;
+
+[ 4 ] [
+ "nested-2" <c-object>
+ "nested" <c-object>
+ 4 over set-nested-x
+ over set-nested-2-y
+ nested-2-y
+ nested-x
+] unit-test
diff --git a/basis/alien/structs/structs.factor b/basis/alien/structs/structs.factor
old mode 100644
new mode 100755
index 698518b4e5..8ec694198d
--- a/basis/alien/structs/structs.factor
+++ b/basis/alien/structs/structs.factor
@@ -2,10 +2,18 @@
! See http://factorcode.org/license.txt for BSD license.
USING: accessors arrays assocs generic hashtables kernel kernel.private
math namespaces parser sequences strings words libc fry
-alien.c-types alien.structs.fields cpu.architecture math.order ;
+alien.c-types alien.structs.fields cpu.architecture math.order
+quotations ;
IN: alien.structs
-TUPLE: struct-type size align fields boxer-quot unboxer-quot getter setter ;
+TUPLE: struct-type
+size
+align
+fields
+{ boxer-quot callable }
+{ unboxer-quot callable }
+{ getter callable }
+{ setter callable } ;
M: struct-type heap-size size>> ;