[Getdata-commits] SF.net SVN: getdata:[890] trunk/getdata/bindings

[<ket...@us...>]

Revision: 890
          http://sourceforge.net/p/getdata/code/890
Author:   ketiltrout
Date:     2014-04-30 21:48:53 +0000 (Wed, 30 Apr 2014)
Log Message:
-----------
Fix binding tests for DSV 10.
Fix gd_get_const and gd_get_string.

Modified Paths:
--------------
    trunk/getdata/bindings/Makefile.am
    trunk/getdata/bindings/cxx/test/big_test.cpp
    trunk/getdata/bindings/f77/test/big_test.f
    trunk/getdata/bindings/f77/test/big_test95.f90
    trunk/getdata/bindings/idl/getdata.c
    trunk/getdata/bindings/idl/test/big_test.pro
    trunk/getdata/bindings/python/test/big_test.py

Modified: trunk/getdata/bindings/Makefile.am
===================================================================
--- trunk/getdata/bindings/Makefile.am	2014-04-30 18:10:25 UTC (rev 889)
+++ trunk/getdata/bindings/Makefile.am	2014-04-30 21:48:53 UTC (rev 890)
@@ -55,8 +55,8 @@
 make_parameters_SOURCES = make_parameters.c
 nodist_make_parameters_SOURCES = ../src/getdata.h ../src/gd_config.h
 
-SUBDIRS = . ${F77_SUBDIR} ${CXX_SUBDIR} ${IDL_SUBDIR} ${MATLAB_SUBDIR} \
-					${PY_SUBDIR} ${PERL_SUBDIR} ${PHP_SUBDIR}
+SUBDIRS = . ${F77_SUBDIR} ${CXX_SUBDIR} ${IDL_SUBDIR} ${PY_SUBDIR} \
+					${PERL_SUBDIR} ${MATLAB_SUBDIR} ${PHP_SUBDIR}
 
 make_parameters$(EXEEXT): $(make_parameters_SOURCES) \
 				    $(nodist_make_parameters_SOURCES)

Modified: trunk/getdata/bindings/cxx/test/big_test.cpp
===================================================================
--- trunk/getdata/bindings/cxx/test/big_test.cpp	2014-04-30 18:10:25 UTC (rev 889)
+++ trunk/getdata/bindings/cxx/test/big_test.cpp	2014-04-30 21:48:53 UTC (rev 890)
@@ -1270,7 +1270,7 @@
   // 157: Dirfile::Standards check
   n = d->Standards();
   CHECK_OK2(157,1);
-  CHECK_INT(157,n,9);
+  CHECK_INT(157,n,GD_DIRFILE_STANDARDS_VERSION);
   d->Standards(0);
   CHECK_ERROR2(157,2,GD_E_ARGUMENT);
 

Modified: trunk/getdata/bindings/f77/test/big_test.f
===================================================================
--- trunk/getdata/bindings/f77/test/big_test.f	2014-04-30 18:10:25 UTC (rev 889)
+++ trunk/getdata/bindings/f77/test/big_test.f	2014-04-30 21:48:53 UTC (rev 890)
@@ -1638,7 +1638,7 @@
       n = GDSV_C
       CALL GDSTDV(n, d)
       CALL CHKOK2(ne, 157, 1, d)
-      CALL CHKINT(ne, 157, n, 9)
+      CALL CHKINT(ne, 157, n, GD_DSV)
 
       n = 0
       CALL GDSTDV(n, d)

Modified: trunk/getdata/bindings/f77/test/big_test95.f90
===================================================================
--- trunk/getdata/bindings/f77/test/big_test95.f90	2014-04-30 18:10:25 UTC (rev 889)
+++ trunk/getdata/bindings/f77/test/big_test95.f90	2014-04-30 21:48:53 UTC (rev 890)
@@ -1749,7 +1749,7 @@
 ! 157: fgd_dirfile_standards
   n = fgd_dirfile_standards(d, GD_VERSION_CURRENT)
   call check_ok2(ne, 157, 1, d)
-  call check_int(ne, 157, n, 9)
+  call check_int(ne, 157, n, GD_DIRFILE_STANDARDS_VERSION)
 
   n = fgd_dirfile_standards(d, 0)
   call check_err2(ne, 157, 2, d, GD_E_ARGUMENT)

Modified: trunk/getdata/bindings/idl/getdata.c
===================================================================
--- trunk/getdata/bindings/idl/getdata.c	2014-04-30 18:10:25 UTC (rev 889)
+++ trunk/getdata/bindings/idl/getdata.c	2014-04-30 21:48:53 UTC (rev 890)
@@ -173,38 +173,54 @@
 }
 
 /* convert a GetData type code to an IDL type code */
-gd_static_inline_ UCHAR gdidl_idl_type(gd_type_t t) {
+gd_static_inline_ UCHAR gdidl_idl_type(gd_type_t t)
+{
+  UCHAR it;
+  dtrace("0x%X", t);
+
   switch (t) {
     case GD_UINT8:
-      return IDL_TYP_BYTE;
+      it = IDL_TYP_BYTE;
+      break;
     case GD_UINT16:
-      return IDL_TYP_UINT;
+      it = IDL_TYP_UINT;
+      break;
     case GD_INT8: /* there is no signed 8-bit type in IDL
                      - we type promote to INT */
     case GD_INT16:
-      return IDL_TYP_INT;
+      it = IDL_TYP_INT;
+      break;
     case GD_UINT32:
-      return IDL_TYP_ULONG;
+      it = IDL_TYP_ULONG;
+      break;
     case GD_INT32:
-      return IDL_TYP_LONG;
+      it = IDL_TYP_LONG;
+      break;
     case GD_UINT64:
-      return IDL_TYP_ULONG64;
+      it = IDL_TYP_ULONG64;
+      break;
     case GD_INT64:
-      return IDL_TYP_LONG64;
+      it = IDL_TYP_LONG64;
+      break;
     case GD_FLOAT32:
-      return IDL_TYP_FLOAT;
+      it = IDL_TYP_FLOAT;
+      break;
     case GD_FLOAT64:
-      return IDL_TYP_DOUBLE;
+      it = IDL_TYP_DOUBLE;
+      break;
     case GD_COMPLEX64:
-      return IDL_TYP_COMPLEX;
+      it = IDL_TYP_COMPLEX;
+      break;
     case GD_COMPLEX128:
-      return IDL_TYP_DCOMPLEX;
+      it = IDL_TYP_DCOMPLEX;
+      break;
     case GD_NULL:
     case GD_UNKNOWN:
-      ;
+      it = IDL_TYP_UNDEF;
   }
 
-  return IDL_TYP_UNDEF;
+  dreturn("%u", it);
+  return it;
 }
 
 /* convert an IDL type code to a GetData type code */

Modified: trunk/getdata/bindings/idl/test/big_test.pro
===================================================================
--- trunk/getdata/bindings/idl/test/big_test.pro	2014-04-30 18:10:25 UTC (rev 889)
+++ trunk/getdata/bindings/idl/test/big_test.pro	2014-04-30 21:48:53 UTC (rev 890)
@@ -1024,7 +1024,7 @@
 ;  157: gd_dirfile_standards
 n = gd_dirfile_standards(d, /CURRENT)
 nume += check_ok2(157, 1, d)
-nume += check_simple(157, n, 9)
+nume += check_simple(157, n, !GD.DIRFILE_STANDARDS_VERSION)
 n = gd_dirfile_standards(d, 0)
 nume += check_error2(157, 2, d, !GD.E_ARGUMENT)
 

Modified: trunk/getdata/bindings/python/test/big_test.py
===================================================================
--- trunk/getdata/bindings/python/test/big_test.py	2014-04-30 18:10:25 UTC (rev 889)
+++ trunk/getdata/bindings/python/test/big_test.py	2014-04-30 21:48:53 UTC (rev 890)
@@ -1321,7 +1321,7 @@
   n = d.standards
 except:
   CheckOK2(157,1)
-CheckSimple(157,n,9)
+CheckSimple(157,n,pygetdata.DIRFILE_STANDARDS_VERSION)
 
 try:
   d.standards = 0

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.