Merge pull request #852 from apotschka/master

Problem: No support for double precision floating point variables.

AUTHORS

@@ -18,3 +18,4 @@ Michal Hrušecký
 Dave Meehan
 Wes Young
 Kouhei Sutou
+Andreas Potschka

README.md

@@ -804,7 +804,9 @@ file:
     <method name = "tutorial">
         <argument name = "void pointer" type = "anything" />
         <argument name = "standard int" type = "integer" />
-        <argument name = "standard float" type = "real" />
+        <argument name = "default float" type = "real" />
+        <argument name = "standard float" type = "real" size = "4" />
+        <argument name = "standard double" type = "real" size = "8" />
         <argument name = "standard bool" type = "boolean" />
         <argument name = "fixed size unsigned integer" type = "number" size = "4">
             Supported sizes are 1, 2, 4, and 8.
@@ -939,7 +941,7 @@ This is an incomplete list of API types:
 
 * "number" -- unsigned number, with 'size = "1|2|4|8"'.
 
-* "real" -- single-precision floating point. [TODO: single? why not double?]
+* "real" -- single-precision floating point with 'size = "4"' (default) or double-precision with 'size = "8"'.
 
 * "buffer" -- byte array. When passing a buffer argument, if the next argument has type 'size', the binding may fill the size automatically. To return a buffer, you should specify 'size' attribute that defines how to set the buffer size. This can be a constant, 'size = "ZUUID_LEN"', or a dot followed by method name in the same class, e.g. 'size = ".size"'.
 

README.txt

@@ -327,7 +327,7 @@ This is an incomplete list of API types:
 
 * "number" -- unsigned number, with 'size = "1|2|4|8"'.
 
-* "real" -- single-precision floating point. [TODO: single? why not double?]
+* "real" -- single-precision floating point with 'size = "4"' (default) or double-precision with 'size = "8"'.
 
 * "buffer" -- byte array. When passing a buffer argument, if the next argument has type 'size', the binding may fill the size automatically. To return a buffer, you should specify 'size' attribute that defines how to set the buffer size. This can be a constant, 'size = "ZUUID_LEN"', or a dot followed by method name in the same class, e.g. 'size = ".size"'.
 

api/myclass.api

@@ -133,7 +133,9 @@
     <method name = "tutorial">
         <argument name = "void pointer" type = "anything" />
         <argument name = "standard int" type = "integer" />
-        <argument name = "standard float" type = "real" />
+        <argument name = "default float" type = "real" />
+        <argument name = "standard float" type = "real" size = "4" />
+        <argument name = "standard double" type = "real" size = "8" />
         <argument name = "standard bool" type = "boolean" />
         <argument name = "fixed size unsigned integer" type = "number" size = "4">
             Supported sizes are 1, 2, 4, and 8.

mkapi.py

@@ -246,7 +246,8 @@ def __init__(self, name, size=None):
             ("uint16_t", "") : ZT("number", 2),
             ("uint32_t", "") : ZT("number", 4),
             ("uint64_t", "") : ZT("number", 8),
-            ("float", "") : ZT("real"),
+            ("float", "") : ZT("real", 4),
+            ("double", "") : ZT("real", 8),
             ("char", "*") : ZT("string"),
             ("byte", "*") : ZT("buffer"),
             ("off_t", "") : ZT("file_size"),

zproject_class_api.gsl

@@ -93,7 +93,11 @@ function resolve_c_container (container)
     endif
 
     my.type = my.container.type
-    my.size = my.container.size? 1
+    if my.type = "real" # use different default for backwards compatibility
+        my.size = my.container.size? 4
+    else
+        my.size = my.container.size? 1
+    endif
     my.c_type = ""
     my.stars = ""
 
@@ -115,7 +119,11 @@ function resolve_c_container (container)
     elsif my.type = "size"
         my.c_type = "size_t"
     elsif my.type = "real"
-        my.c_type = "float"
+        if my.size = 4
+            my.c_type = "float"
+        elsif my.size = 8
+            my.c_type = "double"
+        endif
     elsif my.type = "number"
         if my.size = 1
             my.c_type = "uint8_t"

zproject_java_lib.gsl

@@ -67,8 +67,13 @@ function resolve_container (container)
         endif
 
     elsif my.container.type = "real"
-        my.container.jni_java_type = "float"
-        my.container.jni_jni_type = "jfloat"
+        if my.container.size ?= "4"
+            my.container.jni_java_type = "float"
+            my.container.jni_jni_type = "jfloat"
+        elsif my.container.size ?= "8"
+            my.container.jni_java_type = "double"
+            my.container.jni_jni_type = "jdouble"
+        endif
 
     elsif my.container.type = "buffer"
         if my.container.by_reference

zproject_python.gsl

@@ -94,7 +94,11 @@ function resolve_container (container)
     elsif my.container.type = "size"
         my.container.python_type = "c_size_t"
     elsif my.container.type = "real"
-        my.container.python_type = "c_float"
+        if my.container.size = "4"
+            my.container.python_type = "c_float"
+        elsif my.container.size = "8"
+            my.container.python_type = "c_double"
+        endif
     elsif my.container.type = "buffer"
 #        my.container.python_type = "POINTER(c_byte)"
         my.container.python_type = "c_void_p"