alien.c-types: not necessary to import `short` differently anymore

[factor.git] / extra / alien / fortran / fortran-tests.factor

diff --git a/extra/alien/fortran/fortran-tests.factor b/extra/alien/fortran/fortran-tests.factor
index ad2a60ddc47f968813b5eb927252ed6d241a25a8..0e1b38d6781020f8930a68ab8585a52e1e9c1eaf 100644 (file)
--- a/extra/alien/fortran/fortran-tests.factor
+++ b/extra/alien/fortran/fortran-tests.factor
@@ -1,9 +1,9 @@
 ! (c) 2009 Joe Groff, see BSD license
-USING: accessors alien alien.c-types alien.complex
-alien.data alien.fortran alien.fortran.private alien.strings
-classes.struct arrays assocs byte-arrays combinators fry
-generalizations io.encodings.ascii kernel macros
-macros.expander namespaces sequences shuffle tools.test vocabs.parser ;
+USING: alien alien.c-types alien.complex alien.data
+alien.fortran alien.fortran.private alien.strings
+byte-arrays classes.struct combinators generalizations
+io.encodings.ascii kernel namespaces sequences shuffle
+tools.test vocabs.parser ;
 FROM: alien.syntax => pointer: ;
 QUALIFIED-WITH: alien.c-types c
 IN: alien.fortran.tests
@@ -200,13 +200,13 @@ intel-unix-abi fortran-abi [
             [ { [ length ] [ drop ] [ drop ] [ drop ] [ drop ] } spread ]
         } 5 ncleave
         ! [fortran-invoke]
-        [ 
+        [
             c:void "funpack" "funtimes_"
-            { pointer: { c:char 12 } pointer: c:longlong pointer: c:float pointer: complex-float pointer: c:short c:long }
+            { pointer: { c:char 12 } pointer: c:longlong pointer: c:float pointer: complex-float pointer: c:short c:long } f
             alien-invoke
         ] 6 nkeep
         ! [fortran-results>]
-        shuffle( aa ba ca da ea ab -- aa ab ba ca da ea ) 
+        shuffle( aa ba ca da ea ab -- aa ab ba ca da ea )
         {
             [ drop ]
             [ drop ]
@@ -227,10 +227,10 @@ intel-unix-abi fortran-abi [
             [ { [ drop ] } spread ]
         } 1 ncleave
         ! [fortran-invoke]
-        [ c:float "funpack" "fun_times_" { pointer: { c:float 0 } } alien-invoke ]
+        [ c:float "funpack" "fun_times_" { pointer: { c:float 0 } } f alien-invoke ]
         1 nkeep
         ! [fortran-results>]
-        shuffle( reta aa -- reta aa ) 
+        shuffle( reta aa -- reta aa )
         { [ ] [ drop ] } spread
     ] ] [
         "REAL" "funpack" "FUN_TIMES" { "REAL(*)" }
@@ -245,7 +245,7 @@ intel-unix-abi fortran-abi [
         ! [fortran-invoke]
         [
             c:void "funpack" "fun_times_"
-            { pointer: complex-float pointer: { c:float 0 } } 
+            { pointer: complex-float pointer: { c:float 0 } } f
             alien-invoke
         ] 2 nkeep
         ! [fortran-results>]
@@ -262,11 +262,11 @@ intel-unix-abi fortran-abi [
         ! [fortran-invoke]
         [
             c:void "funpack" "fun_times_"
-            { pointer: { c:char 20 } long } 
+            { pointer: { c:char 20 } long } f
             alien-invoke
         ] 2 nkeep
         ! [fortran-results>]
-        shuffle( reta retb -- reta retb ) 
+        shuffle( reta retb -- reta retb )
         { [ ] [ ascii alien>nstring ] } spread
     ] ] [
         "CHARACTER*20" "funpack" "FUN_TIMES" { }
@@ -288,11 +288,11 @@ intel-unix-abi fortran-abi [
         ! [fortran-invoke]
         [
             c:void "funpack" "fun_times_"
-            { pointer: { c:char 10 } long pointer: { c:char 20 } pointer: c:float pointer: { c:char 30 } c:long c:long } 
+            { pointer: { c:char 10 } long pointer: { c:char 20 } pointer: c:float pointer: { c:char 30 } c:long c:long } f
             alien-invoke
         ] 7 nkeep
         ! [fortran-results>]
-        shuffle( reta retb aa ba ca ab cb -- reta retb aa ab ba ca cb ) 
+        shuffle( reta retb aa ba ca ab cb -- reta retb aa ab ba ca cb )
         {
             [ ]
             [ ascii alien>nstring ]