add aliases to classes.c-types to look more like FFI types

diff --git a/extra/classes/c-types/c-types-docs.factor b/extra/classes/c-types/c-types-docs.factor
index 58ebf7a06372fbeeaf35b0ee409e825d50598447..df21db01046299f7d0b1bdcc28baaf0e87a10d9d 100644 (file)
--- a/extra/classes/c-types/c-types-docs.factor
+++ b/extra/classes/c-types/c-types-docs.factor
@@ -1,6 +1,7 @@
 ! (c)Joe Groff bsd license
-USING: alien arrays classes help.markup help.syntax kernel math
+USING: alien arrays classes help.markup help.syntax kernel
 specialized-arrays.direct ;
+QUALIFIED: math
 IN: classes.c-types
 
 HELP: c-type-class
@@ -11,7 +12,7 @@ HELP: char
 
 HELP: direct-array-of
 { $values
-    { "alien" c-ptr } { "len" integer } { "class" c-type-class }
+    { "alien" c-ptr } { "len" math:integer } { "class" c-type-class }
     { "array" "a direct array" }
 }
 { $description "Constructs one of the " { $link "specialized-arrays.direct" } " over " { $snippet "len" } " elements of type " { $snippet "class" } " located at the referenced location in raw memory." } ;
@@ -28,12 +29,18 @@ HELP: longlong
 HELP: short
 { $class-description "A signed two-byte integer quantity." } ;
 
-HELP: single-complex
+HELP: complex-float
 { $class-description "A single-precision complex floating point quantity." } ;
 
-HELP: single-float
+HELP: complex-double
+{ $class-description "A double-precision complex floating point quantity. This is an alias for the Factor " { $link math:complex } " type." } ;
+
+HELP: float
 { $class-description "A single-precision floating point quantity." } ;
 
+HELP: double
+{ $class-description "A double-precision floating point quantity. This is an alias for the Factor " { $link math:float } " type." } ;
+
 HELP: uchar
 { $class-description "An unsigned one-byte integer quantity." } ;
 
@@ -49,6 +56,12 @@ HELP: ulonglong
 HELP: ushort
 { $class-description "An unsigned two-byte integer quantity." } ;
 
+HELP: bool
+{ $class-description "A boolean value. This is an alias to the Factor " { $link boolean } " class." } ;
+
+HELP: void*
+{ $class-description "A pointer to raw C memory. This is an alias to the Factor " { $link pinned-c-ptr } " class." } ;
+
 ARTICLE: "classes.c-types" "C type classes"
 "The " { $vocab-link "classes.c-types" } " vocabulary defines Factor classes that correspond to C types in the FFI."
 { $subsection char }
@@ -61,11 +74,12 @@ ARTICLE: "classes.c-types" "C type classes"
 { $subsection ulong }
 { $subsection longlong }
 { $subsection ulonglong }
-{ $subsection single-float }
 { $subsection float }
-{ $subsection single-complex }
-{ $subsection complex }
-{ $subsection pinned-c-ptr }
+{ $subsection double }
+{ $subsection complex-float }
+{ $subsection complex-double }
+{ $subsection bool }
+{ $subsection void* }
 "The vocabulary also provides a word for constructing " { $link "specialized-arrays.direct" } " of C types over raw memory:"
 { $subsection direct-array-of } ;
 

diff --git a/extra/classes/c-types/c-types.factor b/extra/classes/c-types/c-types.factor
index e53a813825d6b001721f868dfb92605ccffb41f0..97cf20d4fcf387a7c14e2b9aa3b385e62b75de5b 100644 (file)
--- a/extra/classes/c-types/c-types.factor
+++ b/extra/classes/c-types/c-types.factor
@@ -1,6 +1,6 @@
 ! (c)Joe Groff bsd license
 USING: alien alien.c-types classes classes.predicate kernel
-math math.bitwise math.order namespaces sequences words
+math.bitwise math.order namespaces sequences words
 specialized-arrays.direct.alien
 specialized-arrays.direct.bool
 specialized-arrays.direct.char
@@ -17,46 +17,53 @@ specialized-arrays.direct.uint
 specialized-arrays.direct.ulong
 specialized-arrays.direct.ulonglong
 specialized-arrays.direct.ushort ;
+QUALIFIED: math
 IN: classes.c-types
 
-PREDICATE: char < fixnum
+PREDICATE: char < math:fixnum
     HEX: -80 HEX: 7f between? ;
 
-PREDICATE: uchar < fixnum
+PREDICATE: uchar < math:fixnum
     HEX: 0 HEX: ff between? ;
 
-PREDICATE: short < fixnum
+PREDICATE: short < math:fixnum
     HEX: -8000 HEX: 7fff between? ;
 
-PREDICATE: ushort < fixnum
+PREDICATE: ushort < math:fixnum
     HEX: 0 HEX: ffff between? ;
 
-PREDICATE: int < integer
+PREDICATE: int < math:integer
     HEX: -8000,0000 HEX: 7fff,ffff between? ;
 
-PREDICATE: uint < integer
+PREDICATE: uint < math:integer
     HEX: 0 HEX: ffff,ffff between? ;
 
-PREDICATE: longlong < integer
+PREDICATE: longlong < math:integer
     HEX: -8000,0000,0000,0000 HEX: 7fff,ffff,ffff,ffff between? ;
 
-PREDICATE: ulonglong < integer
+PREDICATE: ulonglong < math:integer
     HEX: 0 HEX: ffff,ffff,ffff,ffff between? ;
 
-UNION: single-float float ;
-UNION: single-complex complex ;
+UNION: double math:float ;
+UNION: complex-double math:complex ;
+
+UNION: bool boolean ;
+UNION: void* pinned-c-ptr ;
+
+UNION: float math:float ;
+UNION: complex-float math:complex ;
 
 SYMBOLS: long ulong long-bits ;
 
 <<
     "long" heap-size 8 =
     [
-        \  long integer [ HEX: -8000,0000,0000,0000 HEX: 7fff,ffff,ffff,ffff between? ] define-predicate-class
-        \ ulong integer [ HEX:                    0 HEX: ffff,ffff,ffff,ffff between? ] define-predicate-class
+        \  long math:integer [ HEX: -8000,0000,0000,0000 HEX: 7fff,ffff,ffff,ffff between? ] define-predicate-class
+        \ ulong math:integer [ HEX:                    0 HEX: ffff,ffff,ffff,ffff between? ] define-predicate-class
         64 \ long-bits set-global
     ] [
-        \  long integer [ HEX: -8000,0000 HEX: 7fff,ffff between? ] define-predicate-class
-        \ ulong integer [ HEX:          0 HEX: ffff,ffff between? ] define-predicate-class
+        \  long math:integer [ HEX: -8000,0000 HEX: 7fff,ffff between? ] define-predicate-class
+        \ ulong math:integer [ HEX:          0 HEX: ffff,ffff between? ] define-predicate-class
         32 \ long-bits set-global
     ] if
 >>
@@ -72,7 +79,9 @@ SYMBOLS: long ulong long-bits ;
     "class-direct-array" word-prop ;
 
 \ f            f            "void*"          \ <direct-void*-array>          set-class-c-type
+void*          f            "void*"          \ <direct-void*-array>          set-class-c-type
 pinned-c-ptr   f            "void*"          \ <direct-void*-array>          set-class-c-type
+bool           f            "bool"           \ <direct-bool-array>           set-class-c-type
 boolean        f            "bool"           \ <direct-bool-array>           set-class-c-type
 char           0            "char"           \ <direct-char-array>           set-class-c-type
 uchar          0            "uchar"          \ <direct-uchar-array>          set-class-c-type
@@ -84,10 +93,10 @@ long           0            "long"           \ <direct-long-array>           set
 ulong          0            "ulong"          \ <direct-ulong-array>          set-class-c-type
 longlong       0            "longlong"       \ <direct-longlong-array>       set-class-c-type
 ulonglong      0            "ulonglong"      \ <direct-ulonglong-array>      set-class-c-type
-float          0.0          "double"         \ <direct-double-array>         set-class-c-type
-single-float   0.0          "float"          \ <direct-float-array>          set-class-c-type
-complex        C{ 0.0 0.0 } "complex-double" \ <direct-complex-double-array> set-class-c-type
-single-complex C{ 0.0 0.0 } "complex-float"  \ <direct-complex-float-array>  set-class-c-type
+float          0.0          "float"          \ <direct-float-array>          set-class-c-type
+double         0.0          "double"         \ <direct-double-array>         set-class-c-type
+complex-float  C{ 0.0 0.0 } "complex-float"  \ <direct-complex-float-array>  set-class-c-type
+complex-double C{ 0.0 0.0 } "complex-double" \ <direct-complex-double-array> set-class-c-type
 
 char      [  8 bits  8 >signed ] "coercer" set-word-prop
 uchar     [  8 bits            ] "coercer" set-word-prop