From e76229a8f655fd025ac5ae68cbc0e7bccfd31a48 Mon Sep 17 00:00:00 2001 From: Jeremy Hughes Date: Tue, 7 Jul 2009 10:56:33 +1200 Subject: [PATCH 1/9] alien.inline.compiler: x86_64 check and hook methods --- basis/alien/inline/compiler/compiler.factor | 26 ++++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/basis/alien/inline/compiler/compiler.factor b/basis/alien/inline/compiler/compiler.factor index b5a7861d6b..2f5fd29aff 100644 --- a/basis/alien/inline/compiler/compiler.factor +++ b/basis/alien/inline/compiler/compiler.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays combinators fry generalizations io.encodings.ascii io.files io.files.temp io.launcher kernel -locals sequences system ; +locals sequences system words ; IN: alien.inline.compiler SYMBOL: C @@ -27,20 +27,28 @@ SYMBOL: C++ { C++ [ "g++" ] } } case ; +HOOK: compiler-descr os ( lang -- descr ) + +M: word compiler-descr compiler 1array ; +M: macosx compiler-descr + call-next-method cpu x86.64? + [ { "-arch" "x86_64" } append ] when ; + +HOOK: link-descr os ( -- descr ) + +M: word link-descr { "-shared" "-o" } ; +M: macosx link-descr + { "-g" "-prebind" "-dynamiclib" "-o" } + cpu x86.64? [ { "-arch" "x86_64" } prepend ] when ; + : link-command ( in out lang -- descr ) - compiler os { - { [ dup linux? ] - [ drop { "-shared" "-o" } ] } - { [ dup macosx? ] - [ drop { "-g" "-prebind" "-dynamiclib" "-o" } ] } - [ name>> "unimplemented for: " prepend throw ] - } cond swap prefix prepend prepend ; + compiler-descr link-descr append prepend prepend ; :: compile-to-object ( lang contents name -- ) name ".o" append temp-file contents name lang src-suffix append temp-file [ ascii set-file-contents ] keep 2array - { "-fPIC" "-c" "-o" } lang compiler prefix prepend + lang compiler-descr { "-fPIC" "-c" "-o" } append prepend try-process ; :: link-object ( lang args name -- ) From da024f5547b43b65f59b6dd4eed98c34b5297da4 Mon Sep 17 00:00:00 2001 From: Jeremy Hughes Date: Tue, 7 Jul 2009 16:07:27 +1200 Subject: [PATCH 2/9] alien.inline: file get path>> instead of vocab-source-path --- basis/alien/inline/inline.factor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/basis/alien/inline/inline.factor b/basis/alien/inline/inline.factor index ae4a95497a..365b56ca28 100644 --- a/basis/alien/inline/inline.factor +++ b/basis/alien/inline/inline.factor @@ -4,7 +4,7 @@ USING: accessors alien.inline.compiler alien.inline.types alien.libraries alien.parser arrays assocs effects fry generalizations grouping io.files io.files.info io.files.temp kernel lexer math math.order math.ranges multiline namespaces -sequences splitting strings system vocabs.loader +sequences source-files splitting strings system vocabs.loader vocabs.parser words ; IN: alien.inline @@ -48,7 +48,7 @@ SYMBOL: c-strings : compile-library? ( -- ? ) library-path dup exists? [ - current-vocab vocab-source-path + file get path>> [ file-info modified>> ] bi@ <=> +lt+ = ] [ drop t ] if ; From 66a740aaafad0f158a186a2064d6a8ea7e87b14b Mon Sep 17 00:00:00 2001 From: Jeremy Hughes Date: Tue, 7 Jul 2009 16:23:26 +1200 Subject: [PATCH 3/9] moved alien.inline tests to inline-tests.factor --- basis/alien/inline/{tests/tests.factor => inline-tests.factor} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename basis/alien/inline/{tests/tests.factor => inline-tests.factor} (100%) diff --git a/basis/alien/inline/tests/tests.factor b/basis/alien/inline/inline-tests.factor similarity index 100% rename from basis/alien/inline/tests/tests.factor rename to basis/alien/inline/inline-tests.factor From e140d80d717eed9ab0a839ae37a7c5481fecadc6 Mon Sep 17 00:00:00 2001 From: Jeremy Hughes Date: Wed, 8 Jul 2009 09:43:19 +1200 Subject: [PATCH 4/9] alien.inline: prepend vocab name to c-library name Conflicts: basis/alien/inline/inline.factor --- basis/alien/inline/compiler/compiler.factor | 12 +++++++++--- basis/alien/inline/inline-tests.factor | 9 ++++++--- basis/alien/inline/inline.factor | 9 ++------- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/basis/alien/inline/compiler/compiler.factor b/basis/alien/inline/compiler/compiler.factor index 2f5fd29aff..d9f87a9f3b 100644 --- a/basis/alien/inline/compiler/compiler.factor +++ b/basis/alien/inline/compiler/compiler.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays combinators fry generalizations io.encodings.ascii io.files io.files.temp io.launcher kernel -locals sequences system words ; +locals make sequences system vocabs.parser words ; IN: alien.inline.compiler SYMBOL: C @@ -15,6 +15,12 @@ SYMBOL: C++ { [ dup windows? ] [ drop ".dll" ] } } cond ; +: library-path ( str -- str' ) + '[ + "lib-" % current-vocab name>> % + "-" % _ % library-suffix % + ] "" make temp-file ; + : src-suffix ( lang -- str ) { { C [ ".c" ] } @@ -52,8 +58,8 @@ M: macosx link-descr try-process ; :: link-object ( lang args name -- ) - args name [ "lib" prepend library-suffix append ] - [ ".o" append ] bi [ temp-file ] bi@ 2array + args name [ library-path ] + [ ".o" append temp-file ] bi 2array lang link-command try-process ; :: compile-to-library ( lang args contents name -- ) diff --git a/basis/alien/inline/inline-tests.factor b/basis/alien/inline/inline-tests.factor index acd2d615cd..60e6b3b594 100644 --- a/basis/alien/inline/inline-tests.factor +++ b/basis/alien/inline/inline-tests.factor @@ -15,7 +15,8 @@ C-FUNCTION: const-int add ( int a, int b ) { 2 1 } [ add ] must-infer-as [ 5 ] [ 2 3 add ] unit-test -<< library-path dup exists? [ delete-file ] [ drop ] if >> +<< c-library get library-path dup exists? +[ delete-file ] [ drop ] if >> C-LIBRARY: cpplib @@ -34,7 +35,8 @@ C-FUNCTION: const-char* hello ( ) { 0 1 } [ hello ] must-infer-as [ "hello world" ] [ hello ] unit-test -<< library-path dup exists? [ delete-file ] [ drop ] if >> +<< c-library get library-path dup exists? +[ delete-file ] [ drop ] if >> C-LIBRARY: compile-error @@ -45,4 +47,5 @@ C-FUNCTION: char* breakme ( ) << [ compile-c-library ] must-fail >> -<< library-path dup exists? [ delete-file ] [ drop ] if >> +<< c-library get library-path dup exists? +[ delete-file ] [ drop ] if >> diff --git a/basis/alien/inline/inline.factor b/basis/alien/inline/inline.factor index 365b56ca28..5ddd95a4cd 100644 --- a/basis/alien/inline/inline.factor +++ b/basis/alien/inline/inline.factor @@ -41,13 +41,8 @@ SYMBOL: c-strings : append-function-body ( prototype-str -- str ) " {\n" append parse-here append "\n}\n" append ; - -: library-path ( -- str ) - "lib" c-library get library-suffix - 3array concat temp-file ; - : compile-library? ( -- ? ) - library-path dup exists? [ + c-library get library-path dup exists? [ file get path>> [ file-info modified>> ] bi@ <=> +lt+ = ] [ drop t ] if ; @@ -66,7 +61,7 @@ PRIVATE> : compile-c-library ( -- ) compile-library? [ compile-library ] when - c-library get library-path "cdecl" add-library ; + c-library get dup library-path "cdecl" add-library ; : define-c-function ( function types effect -- ) [ factor-function define-declared ] 3keep prototype-string From b421a360c078f95b15af9528a4a6ae1e31e9ab98 Mon Sep 17 00:00:00 2001 From: Jeremy Hughes Date: Wed, 8 Jul 2009 09:45:08 +1200 Subject: [PATCH 5/9] alien.inline: added DELETE-C-LIBRARY: word, mainly for tests Conflicts: basis/alien/inline/inline.factor --- basis/alien/inline/inline-tests.factor | 13 +++++-------- basis/alien/inline/inline.factor | 13 +++++++++---- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/basis/alien/inline/inline-tests.factor b/basis/alien/inline/inline-tests.factor index 60e6b3b594..837f27ceb7 100644 --- a/basis/alien/inline/inline-tests.factor +++ b/basis/alien/inline/inline-tests.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2009 Jeremy Hughes. ! See http://factorcode.org/license.txt for BSD license. -USING: tools.test alien.inline alien.inline.private io.files -io.directories kernel ; +USING: alien.inline alien.inline.private io.directories io.files +kernel namespaces tools.test ; IN: alien.inline.tests C-LIBRARY: const @@ -15,8 +15,7 @@ C-FUNCTION: const-int add ( int a, int b ) { 2 1 } [ add ] must-infer-as [ 5 ] [ 2 3 add ] unit-test -<< c-library get library-path dup exists? -[ delete-file ] [ drop ] if >> +DELETE-C-LIBRARY: const C-LIBRARY: cpplib @@ -35,8 +34,7 @@ C-FUNCTION: const-char* hello ( ) { 0 1 } [ hello ] must-infer-as [ "hello world" ] [ hello ] unit-test -<< c-library get library-path dup exists? -[ delete-file ] [ drop ] if >> +DELETE-C-LIBRARY: cpplib C-LIBRARY: compile-error @@ -47,5 +45,4 @@ C-FUNCTION: char* breakme ( ) << [ compile-c-library ] must-fail >> -<< c-library get library-path dup exists? -[ delete-file ] [ drop ] if >> +DELETE-C-LIBRARY: compile-error diff --git a/basis/alien/inline/inline.factor b/basis/alien/inline/inline.factor index 5ddd95a4cd..c658c6ed3a 100644 --- a/basis/alien/inline/inline.factor +++ b/basis/alien/inline/inline.factor @@ -2,10 +2,10 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors alien.inline.compiler alien.inline.types alien.libraries alien.parser arrays assocs effects fry -generalizations grouping io.files io.files.info io.files.temp -kernel lexer math math.order math.ranges multiline namespaces -sequences source-files splitting strings system vocabs.loader -vocabs.parser words ; +generalizations grouping io.directories io.files +io.files.info io.files.temp kernel lexer math math.order +math.ranges multiline namespaces sequences source-files +splitting strings system vocabs.loader vocabs.parser words ; IN: alien.inline : define-c-include ( str -- ) "#include " prepend c-strings get push ; +: delete-inline-library ( str -- ) + library-path dup exists? [ delete-file ] [ drop ] if ; + SYNTAX: C-LIBRARY: scan define-c-library ; SYNTAX: COMPILE-AS-C++ t library-is-c++ set ; @@ -100,3 +103,5 @@ SYNTAX: C-FUNCTION: function-types-effect define-c-function ; SYNTAX: ;C-LIBRARY compile-c-library ; + +SYNTAX: DELETE-C-LIBRARY: scan delete-inline-library ; From 1c42ebd89e2182482109e219fe8926d293a49003 Mon Sep 17 00:00:00 2001 From: Jeremy Hughes Date: Wed, 8 Jul 2009 09:29:41 +1200 Subject: [PATCH 6/9] alien.inline: allow compiling from non-file vocabs --- basis/alien/inline/inline.factor | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/basis/alien/inline/inline.factor b/basis/alien/inline/inline.factor index c658c6ed3a..07f4693446 100644 --- a/basis/alien/inline/inline.factor +++ b/basis/alien/inline/inline.factor @@ -43,8 +43,10 @@ SYMBOL: c-strings : compile-library? ( -- ? ) c-library get library-path dup exists? [ - file get path>> - [ file-info modified>> ] bi@ <=> +lt+ = + file get [ + path>> + [ file-info modified>> ] bi@ <=> +lt+ = + ] [ drop t ] if* ] [ drop t ] if ; : compile-library ( -- ) From 488f7efc276de69011ea81442353b50a00446970 Mon Sep 17 00:00:00 2001 From: Jeremy Hughes Date: Wed, 8 Jul 2009 14:52:07 +1200 Subject: [PATCH 7/9] alien.inline: added C-TYPEDEF: --- basis/alien/inline/inline-tests.factor | 15 +++++++++++++-- basis/alien/inline/inline.factor | 11 ++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/basis/alien/inline/inline-tests.factor b/basis/alien/inline/inline-tests.factor index 837f27ceb7..2092800c7d 100644 --- a/basis/alien/inline/inline-tests.factor +++ b/basis/alien/inline/inline-tests.factor @@ -1,20 +1,31 @@ ! Copyright (C) 2009 Jeremy Hughes. ! See http://factorcode.org/license.txt for BSD license. USING: alien.inline alien.inline.private io.directories io.files -kernel namespaces tools.test ; +kernel namespaces tools.test alien.c-types ; IN: alien.inline.tests -C-LIBRARY: const +C-LIBRARY: test C-FUNCTION: const-int add ( int a, int b ) return a + b; ; +C-TYPEDEF: double bigfloat + +C-FUNCTION: bigfloat smaller ( bigfloat a ) + return a / 10; +; + ;C-LIBRARY { 2 1 } [ add ] must-infer-as [ 5 ] [ 2 3 add ] unit-test +{ 1 1 } [ smaller ] must-infer-as +[ 1.0 ] [ 10 smaller ] unit-test + +[ t ] [ "double" "bigfloat" [ resolve-typedef ] bi@ = ] unit-test + DELETE-C-LIBRARY: const diff --git a/basis/alien/inline/inline.factor b/basis/alien/inline/inline.factor index 07f4693446..0f05488917 100644 --- a/basis/alien/inline/inline.factor +++ b/basis/alien/inline/inline.factor @@ -5,7 +5,8 @@ alien.libraries alien.parser arrays assocs effects fry generalizations grouping io.directories io.files io.files.info io.files.temp kernel lexer math math.order math.ranges multiline namespaces sequences source-files -splitting strings system vocabs.loader vocabs.parser words ; +splitting strings system vocabs.loader vocabs.parser words +alien.c-types make ; IN: alien.inline : define-c-include ( str -- ) "#include " prepend c-strings get push ; +: define-c-typedef ( old new -- ) + [ typedef ] [ + [ swap "typedef " % % " " % % ";" % ] + "" make c-strings get push + ] 2bi ; + : delete-inline-library ( str -- ) library-path dup exists? [ delete-file ] [ drop ] if ; @@ -104,6 +111,8 @@ SYNTAX: C-INCLUDE: scan define-c-include ; SYNTAX: C-FUNCTION: function-types-effect define-c-function ; +SYNTAX: C-TYPEDEF: scan scan define-c-typedef ; + SYNTAX: ;C-LIBRARY compile-c-library ; SYNTAX: DELETE-C-LIBRARY: scan delete-inline-library ; From 7d218b0263a10f98995ac8b8fce1c3bf61b36854 Mon Sep 17 00:00:00 2001 From: Jeremy Hughes Date: Wed, 8 Jul 2009 15:14:51 +1200 Subject: [PATCH 8/9] alien.inline: added C-STRUCTURE: --- basis/alien/inline/inline-tests.factor | 20 ++++++++++++++++++-- basis/alien/inline/inline.factor | 15 ++++++++++++++- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/basis/alien/inline/inline-tests.factor b/basis/alien/inline/inline-tests.factor index 2092800c7d..19920a58ba 100644 --- a/basis/alien/inline/inline-tests.factor +++ b/basis/alien/inline/inline-tests.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2009 Jeremy Hughes. ! See http://factorcode.org/license.txt for BSD license. USING: alien.inline alien.inline.private io.directories io.files -kernel namespaces tools.test alien.c-types ; +kernel namespaces tools.test alien.c-types alien.structs ; IN: alien.inline.tests C-LIBRARY: test @@ -16,15 +16,31 @@ C-FUNCTION: bigfloat smaller ( bigfloat a ) return a / 10; ; +C-STRUCTURE: rectangle + { "int" "width" } + { "int" "height" } ; + +C-FUNCTION: int area ( rectangle c ) + return c.width * c.height; +; + ;C-LIBRARY { 2 1 } [ add ] must-infer-as [ 5 ] [ 2 3 add ] unit-test +[ t ] [ "double" "bigfloat" [ resolve-typedef ] bi@ = ] unit-test { 1 1 } [ smaller ] must-infer-as [ 1.0 ] [ 10 smaller ] unit-test -[ t ] [ "double" "bigfloat" [ resolve-typedef ] bi@ = ] unit-test +[ t ] [ "rectangle" resolve-typedef struct-type? ] unit-test +{ 1 1 } [ area ] must-infer-as +[ 20 ] [ + "rectangle" + 4 over set-rectangle-width + 5 over set-rectangle-height + area +] unit-test DELETE-C-LIBRARY: const diff --git a/basis/alien/inline/inline.factor b/basis/alien/inline/inline.factor index 0f05488917..68da8b50f9 100644 --- a/basis/alien/inline/inline.factor +++ b/basis/alien/inline/inline.factor @@ -6,7 +6,7 @@ generalizations grouping io.directories io.files io.files.info io.files.temp kernel lexer math math.order math.ranges multiline namespaces sequences source-files splitting strings system vocabs.loader vocabs.parser words -alien.c-types make ; +alien.c-types alien.structs make parser ; IN: alien.inline "" make c-strings get push ] 2bi ; +: define-c-struct ( name vocab fields -- ) + [ define-struct ] [ + nip over + [ + "typedef struct " % "_" % % " {\n" % + [ first2 swap % " " % % ";\n" % ] each + "} " % % ";\n" % + ] "" make c-strings get push + ] 3bi ; + : delete-inline-library ( str -- ) library-path dup exists? [ delete-file ] [ drop ] if ; @@ -113,6 +123,9 @@ SYNTAX: C-FUNCTION: SYNTAX: C-TYPEDEF: scan scan define-c-typedef ; +SYNTAX: C-STRUCTURE: + scan current-vocab parse-definition define-c-struct ; + SYNTAX: ;C-LIBRARY compile-c-library ; SYNTAX: DELETE-C-LIBRARY: scan delete-inline-library ; From 8814e2b308e98fc93d40f50ec9779cb77a3f12c1 Mon Sep 17 00:00:00 2001 From: Jeremy Hughes Date: Wed, 8 Jul 2009 15:15:45 +1200 Subject: [PATCH 9/9] alien.inline.tests: delete libraries before compilation --- basis/alien/inline/inline-tests.factor | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/basis/alien/inline/inline-tests.factor b/basis/alien/inline/inline-tests.factor index 19920a58ba..09b76a4bb5 100644 --- a/basis/alien/inline/inline-tests.factor +++ b/basis/alien/inline/inline-tests.factor @@ -4,6 +4,7 @@ USING: alien.inline alien.inline.private io.directories io.files kernel namespaces tools.test alien.c-types alien.structs ; IN: alien.inline.tests +DELETE-C-LIBRARY: test C-LIBRARY: test C-FUNCTION: const-int add ( int a, int b ) @@ -42,9 +43,8 @@ C-FUNCTION: int area ( rectangle c ) area ] unit-test -DELETE-C-LIBRARY: const - +DELETE-C-LIBRARY: cpplib C-LIBRARY: cpplib COMPILE-AS-C++ @@ -61,9 +61,8 @@ C-FUNCTION: const-char* hello ( ) { 0 1 } [ hello ] must-infer-as [ "hello world" ] [ hello ] unit-test -DELETE-C-LIBRARY: cpplib - +DELETE-C-LIBRARY: compile-error C-LIBRARY: compile-error C-FUNCTION: char* breakme ( ) @@ -71,5 +70,3 @@ C-FUNCTION: char* breakme ( ) ; << [ compile-c-library ] must-fail >> - -DELETE-C-LIBRARY: compile-error