[Getdata-commits] SF.net SVN: getdata:[872] trunk/getdata
Scientific Database Format
Brought to you by:
ketiltrout
Menu
▾
▴
[Getdata-commits] SF.net SVN: getdata:[872] trunk/getdata
|
From: <ket...@us...> - 2013-12-12 03:33:58
|
Revision: 872
http://sourceforge.net/p/getdata/code/872
Author: ketiltrout
Date: 2013-12-12 03:33:54 +0000 (Thu, 12 Dec 2013)
Log Message:
-----------
ANSI C fixes.
Modified Paths:
--------------
trunk/getdata/ChangeLog
trunk/getdata/NEWS
trunk/getdata/bindings/f77/fgetdata.c
trunk/getdata/bindings/perl/GetData.xs
trunk/getdata/configure.ac
trunk/getdata/src/common.c
trunk/getdata/src/entry.c
trunk/getdata/src/getdata.c
trunk/getdata/src/internal.h
trunk/getdata/src/mod.c
trunk/getdata/src/name.c
trunk/getdata/test/alter_clincom.c
trunk/getdata/test/alter_cpolynom_null.c
trunk/getdata/test/alter_entry_recode_recalc.c
trunk/getdata/test/alter_entry_scalar1.c
trunk/getdata/test/alter_entry_scalar3c.c
Modified: trunk/getdata/ChangeLog
===================================================================
--- trunk/getdata/ChangeLog 2013-12-11 22:35:43 UTC (rev 871)
+++ trunk/getdata/ChangeLog 2013-12-12 03:33:54 UTC (rev 872)
@@ -1,3 +1,15 @@
+2013-12-12 D. V. Wiebe <ge...@ke...> svn:872
+ * configure.ac: Disable PHP bindings if we don't have a C99 compiler.
+
+ * src/common.c (_GD_CInvertData): Correct algebra in C89 INVERT macro.
+ * src/getdata.c (_GD_PolynomData): Implement correct C89 POLYNOMC macro.
+ * src/getdata.c (_GD_CDivideData): Correct algebra in C89 DIVIDEC macro.
+
+ * src/entry.c (_GD_CalculateEntry): Return success or failure separately
+ from Dirfile error.
+
+ * src/internal.h: Fix pointer arithmetic in C89 gd_cap_ macro.
+
2013-12-10 D. V. Wiebe <ge...@ke...> svn:868
* src/getdata.h.in src/internal.h: Merge gd_entry_t members 'comp_scal' and
'hidden', plus private member 'calculated' into (public) member 'flags', and
Modified: trunk/getdata/NEWS
===================================================================
--- trunk/getdata/NEWS 2013-12-11 22:35:43 UTC (rev 871)
+++ trunk/getdata/NEWS 2013-12-12 03:33:54 UTC (rev 872)
@@ -50,6 +50,9 @@
* BUG FIX: DIVIDE fields with complex valued divisors are now properly
computed.
+ * BUG FIX: Complex-valued DIVIDE, POLYNOM, and RECIP fields are now computed
+ properly when the library is built in ANSI C mode.
+
* BUG FIX: Writing complex MPLEX fields no longer corrupts the stored data.
* BUG FIX: Several fixes have been made to the sample index encoding (SIE)
Modified: trunk/getdata/bindings/f77/fgetdata.c
===================================================================
--- trunk/getdata/bindings/f77/fgetdata.c 2013-12-11 22:35:43 UTC (rev 871)
+++ trunk/getdata/bindings/f77/fgetdata.c 2013-12-12 03:33:54 UTC (rev 872)
@@ -141,10 +141,10 @@
/* create a gd_triple_t value */
static gd_triplet_t _GDF_SetTriplet(gd_windop_t op, const void *data)
{
+ gd_triplet_t t;
+
dtrace("%i, %p", op, data);
- gd_triplet_t t;
-
switch(op) {
case GD_WINDOP_EQ:
case GD_WINDOP_NE:
@@ -3253,11 +3253,13 @@
const int32_t *return_type, const int32_t *field_num)
{
const void *v;
+ DIRFILE *D;
+ unsigned int nfields;
dtrace("%p, %i, 0x%x, %i", value, *dirfile, *return_type, *field_num);
- DIRFILE *D = _GDF_GetDirfile(*dirfile);
- unsigned int nfields = gd_nfields_by_type(D, GD_CONST_ENTRY);
+ D = _GDF_GetDirfile(*dirfile);
+ nfields = gd_nfields_by_type(D, GD_CONST_ENTRY);
if (!gd_error(D) && (*field_num > 0) && (*field_num <= (int)nfields)) {
v = gd_constants(D, (gd_type_t)*return_type);
@@ -3301,11 +3303,13 @@
const int32_t *dirfile, const int32_t *field_num)
{
const char **v;
+ DIRFILE *D;
+ unsigned int nfields;
dtrace("%p, %i, %i, %i", value, *value_l, *dirfile, *field_num);
- DIRFILE *D = _GDF_GetDirfile(*dirfile);
- unsigned int nfields = gd_nfields_by_type(D, GD_STRING_ENTRY);
+ D = _GDF_GetDirfile(*dirfile);
+ nfields = gd_nfields_by_type(D, GD_STRING_ENTRY);
if (!gd_error(D) && (*field_num > 0) && (*field_num <= (int)nfields)) {
v = gd_strings(D);
@@ -3347,13 +3351,16 @@
/* Return the maximum string value length */
void F77_FUNC(gdstrx, GDSTRX) (int32_t *max, const int32_t *dirfile)
{
- dtrace("%p, %i", max, *dirfile);
-
const char **v;
size_t len = 0;
- DIRFILE *D = _GDF_GetDirfile(*dirfile);
- unsigned int i, nfields = gd_nfields_by_type(D, GD_STRING_ENTRY);
+ DIRFILE *D;
+ unsigned int i, nfields;
+ dtrace("%p, %i", max, *dirfile);
+
+ D = _GDF_GetDirfile(*dirfile);
+ nfields = gd_nfields_by_type(D, GD_STRING_ENTRY);
+
if (!gd_error(D)) {
v = gd_strings(D);
@@ -3553,10 +3560,11 @@
size_t len = 0;
char *fc;
unsigned int i, nalias;
+ DIRFILE *D;
dtrace("%p, %i, %p, %i", max, *dirfile, field_code, *field_code_l);
- DIRFILE* D = _GDF_GetDirfile(*dirfile);
+ D = _GDF_GetDirfile(*dirfile);
_GDF_CString(&fc, field_code, *field_code_l);
nalias = gd_naliases(D, fc);
@@ -3598,11 +3606,12 @@
const char **al;
char *fc;
unsigned int nalias;
+ DIRFILE *D;
dtrace("%p, %i, %i, %p, %i, %i", alias, *alias_l, *dirfile, field_code,
*field_code_l, *num);
- DIRFILE* D = _GDF_GetDirfile(*dirfile);
+ D = _GDF_GetDirfile(*dirfile);
_GDF_CString(&fc, field_code, *field_code_l);
nalias = gd_naliases(D, fc);
@@ -4079,8 +4088,8 @@
GDF_SCIND_F2C(E.scalar_ind[0], *m1_scalar_ind);
GDF_SCIND_F2C(E.scalar_ind[0 + GD_MAX_LINCOM], *b1_scalar_ind);
- E.m[0] = *m1;
- E.b[0] = *b1;
+ E.EN(lincom,m[0]) = *m1;
+ E.EN(lincom,b[0]) = *b1;
if (n > 1) {
_GDF_CString(E.in_fields + 1, in_field2, *in_field2_l);
@@ -4089,8 +4098,8 @@
GDF_SCIND_F2C(E.scalar_ind[1], *m2_scalar_ind);
GDF_SCIND_F2C(E.scalar_ind[1 + GD_MAX_LINCOM], *b2_scalar_ind);
- E.m[1] = *m2;
- E.b[1] = *b2;
+ E.EN(lincom,m[1]) = *m2;
+ E.EN(lincom,b[1]) = *b2;
}
if (n > 2) {
@@ -4100,8 +4109,8 @@
GDF_SCIND_F2C(E.scalar_ind[2], *m3_scalar_ind);
GDF_SCIND_F2C(E.scalar_ind[2 + GD_MAX_LINCOM], *b3_scalar_ind);
- E.m[2] = *m3;
- E.b[2] = *b3;
+ E.EN(lincom,m[2]) = *m3;
+ E.EN(lincom,b[2]) = *b3;
}
gd_add(_GDF_GetDirfile(*dirfile), &E);
@@ -4137,13 +4146,13 @@
dtrace("%i, %p, %i, %i, %p, %i, %g;%g, %p, %i, %i, %g;%g, %p, %i, %i, %p, "
"%i, %g;%g, %p, %i, %i, %g;%g, %p, %i, %i, %p, %i, %g;%g, %p, %i, %i, "
"%g;%g, %p, %i, %i, %i", *dirfile, field_code, *field_code_l, *n_fields,
- in_field1, *in_field1_l, creal(*m1), cimag(*m1), m1_scalar, *m1_scalar_l,
- *m1_scalar_ind, creal(*b1), cimag(*b1), b1_scalar, *b1_scalar_l,
- *b1_scalar_ind, in_field2, *in_field2_l, creal(*m2), cimag(*m2),
- m2_scalar, *m2_scalar_l, *m2_scalar_ind, creal(*b2), cimag(*b2),
+ in_field1, *in_field1_l, crealp(m1), cimagp(m1), m1_scalar, *m1_scalar_l,
+ *m1_scalar_ind, crealp(b1), cimagp(b1), b1_scalar, *b1_scalar_l,
+ *b1_scalar_ind, in_field2, *in_field2_l, crealp(m2), cimagp(m2),
+ m2_scalar, *m2_scalar_l, *m2_scalar_ind, crealp(b2), cimagp(b2),
b2_scalar, *b2_scalar_l, *b2_scalar_ind, in_field3, *in_field3_l,
- creal(*m3), cimag(*m3), m3_scalar, *m3_scalar_l, *m3_scalar_ind,
- creal(*b3), cimag(*b3), b3_scalar, *b3_scalar_l, *b3_scalar_ind,
+ crealp(m3), cimagp(m3), m3_scalar, *m3_scalar_l, *m3_scalar_ind,
+ crealp(b3), cimagp(b3), b3_scalar, *b3_scalar_l, *b3_scalar_ind,
*fragment_index);
memset(&E, 0, sizeof(E));
@@ -4159,8 +4168,8 @@
GDF_SCIND_F2C(E.scalar_ind[0], *m1_scalar_ind);
GDF_SCIND_F2C(E.scalar_ind[0 + GD_MAX_LINCOM], *b1_scalar_ind);
- gd_cp2ca_(E.cm, 0, m1);
- gd_cp2ca_(E.cb, 0, b1);
+ gd_cp2cs_(E.EN(lincom,cm)[0], m1);
+ gd_cp2cs_(E.EN(lincom,cb)[0], b1);
if (n > 1) {
_GDF_CString(E.in_fields + 1, in_field2, *in_field2_l);
@@ -4169,8 +4178,8 @@
GDF_SCIND_F2C(E.scalar_ind[1], *m2_scalar_ind);
GDF_SCIND_F2C(E.scalar_ind[1 + GD_MAX_LINCOM], *b2_scalar_ind);
- gd_cp2ca_(E.cm, 1, m2);
- gd_cp2ca_(E.cb, 1, b2);
+ gd_cp2cs_(E.EN(lincom,cm)[1], m2);
+ gd_cp2cs_(E.EN(lincom,cb)[1], b2);
}
if (n > 2) {
@@ -4180,8 +4189,8 @@
GDF_SCIND_F2C(E.scalar_ind[2], *m3_scalar_ind);
GDF_SCIND_F2C(E.scalar_ind[2 + GD_MAX_LINCOM], *b3_scalar_ind);
- gd_cp2ca_(E.cm, 2, m3);
- gd_cp2ca_(E.cb, 2, b3);
+ gd_cp2cs_(E.EN(lincom,cm)[2], m3);
+ gd_cp2cs_(E.EN(lincom,cb)[2], b3);
}
gd_add(_GDF_GetDirfile(*dirfile), &E);
@@ -4237,30 +4246,30 @@
case 5:
_GDF_CString(E.scalar + 5, a5_scalar, *a5_scalar_l);
GDF_SCIND_F2C(E.scalar_ind[5], *a5_scalar_ind);
- E.a[5] = *a5;
+ E.EN(polynom,a[5]) = *a5;
/* fallthrough */
case 4:
_GDF_CString(E.scalar + 4, a4_scalar, *a4_scalar_l);
GDF_SCIND_F2C(E.scalar_ind[4], *a4_scalar_ind);
- E.a[4] = *a4;
+ E.EN(polynom,a[4]) = *a4;
/* fallthrough */
case 3:
_GDF_CString(E.scalar + 3, a3_scalar, *a3_scalar_l);
GDF_SCIND_F2C(E.scalar_ind[3], *a3_scalar_ind);
- E.a[3] = *a3;
+ E.EN(polynom,a[3]) = *a3;
/* fallthrough */
case 2:
_GDF_CString(E.scalar + 2, a2_scalar, *a2_scalar_l);
GDF_SCIND_F2C(E.scalar_ind[2], *a2_scalar_ind);
- E.a[2] = *a2;
+ E.EN(polynom,a[2]) = *a2;
/* fallthrough */
default:
_GDF_CString(E.scalar + 1, a1_scalar, *a1_scalar_l);
GDF_SCIND_F2C(E.scalar_ind[1], *a1_scalar_ind);
- E.a[1] = *a1;
+ E.EN(polynom,a[1]) = *a1;
_GDF_CString(E.scalar + 0, a0_scalar, *a0_scalar_l);
GDF_SCIND_F2C(E.scalar_ind[0], *a0_scalar_ind);
- E.a[0] = *a0;
+ E.EN(polynom,a[0]) = *a0;
}
gd_add(_GDF_GetDirfile(*dirfile), &E);
@@ -4292,12 +4301,12 @@
dtrace("%i, %p, %i, %i, %p, %i, %g;%g, %p, %i, %i, %g;%g, %p, %i, %i, %g;%g, "
"%p, %i, %i, %g;%g, %p, %i, %i, %g;%g, %p, %i, %i, %g;%g, %p, %i, %i, %i",
*dirfile, field_code, *field_code_l, *poly_ord, in_field, *in_field_l,
- creal(*a0), cimag(*a0), a0_scalar, *a0_scalar_l, *a0_scalar_ind,
- creal(*a1), cimag(*a1), a1_scalar, *a1_scalar_l, *a1_scalar_ind,
- creal(*a2), cimag(*a2), a2_scalar, *a2_scalar_l, *a2_scalar_ind,
- creal(*a3), cimag(*a3), a3_scalar, *a3_scalar_l, *a3_scalar_ind,
- creal(*a4), cimag(*a4), a4_scalar, *a4_scalar_l, *a4_scalar_ind,
- creal(*a5), cimag(*a5), a5_scalar, *a5_scalar_l, *a5_scalar_ind,
+ crealp(a0), cimagp(a0), a0_scalar, *a0_scalar_l, *a0_scalar_ind,
+ crealp(a1), cimagp(a1), a1_scalar, *a1_scalar_l, *a1_scalar_ind,
+ crealp(a2), cimagp(a2), a2_scalar, *a2_scalar_l, *a2_scalar_ind,
+ crealp(a3), cimagp(a3), a3_scalar, *a3_scalar_l, *a3_scalar_ind,
+ crealp(a4), cimagp(a4), a4_scalar, *a4_scalar_l, *a4_scalar_ind,
+ crealp(a5), cimagp(a5), a5_scalar, *a5_scalar_l, *a5_scalar_ind,
*fragment_index);
memset(&E, 0, sizeof(E));
@@ -4317,30 +4326,30 @@
case 5:
_GDF_CString(E.scalar + 5, a5_scalar, *a5_scalar_l);
GDF_SCIND_F2C(E.scalar_ind[5], *a5_scalar_ind);
- gd_cp2ca_(E.ca, 5, a5);
+ gd_cp2cs_(E.EN(polynom,ca)[5], a5);
/* fallthrough */
case 4:
_GDF_CString(E.scalar + 4, a4_scalar, *a4_scalar_l);
GDF_SCIND_F2C(E.scalar_ind[4], *a4_scalar_ind);
- gd_cp2ca_(E.ca, 4, a4);
+ gd_cp2cs_(E.EN(polynom,ca)[4], a4);
/* fallthrough */
case 3:
_GDF_CString(E.scalar + 3, a3_scalar, *a3_scalar_l);
GDF_SCIND_F2C(E.scalar_ind[3], *a3_scalar_ind);
- gd_cp2ca_(E.ca, 3, a3);
+ gd_cp2cs_(E.EN(polynom,ca)[3], a3);
/* fallthrough */
case 2:
_GDF_CString(E.scalar + 2, a2_scalar, *a2_scalar_l);
GDF_SCIND_F2C(E.scalar_ind[2], *a2_scalar_ind);
- gd_cp2ca_(E.ca, 2, a2);
+ gd_cp2cs_(E.EN(polynom,ca)[2], a2);
/* fallthrough */
default:
_GDF_CString(E.scalar + 1, a1_scalar, *a1_scalar_l);
GDF_SCIND_F2C(E.scalar_ind[1], *a1_scalar_ind);
- gd_cp2ca_(E.ca, 1, a1);
+ gd_cp2cs_(E.EN(polynom,ca)[1], a1);
_GDF_CString(E.scalar + 0, a0_scalar, *a0_scalar_l);
GDF_SCIND_F2C(E.scalar_ind[0], *a0_scalar_ind);
- gd_cp2ca_(E.ca, 0, a0);
+ gd_cp2cs_(E.EN(polynom,ca)[0], a0);
}
gd_add(_GDF_GetDirfile(*dirfile), &E);
@@ -4431,7 +4440,7 @@
_GDF_CString(&E.field, field_code, *field_code_l);
_GDF_CString(&E.in_fields[0], in_field, *in_field_l);
E.fragment_index = *fragment_index;
- gd_li2cs_(E.EN(recip,dividend), dividend[0], dividend[1]);
+ gd_li2cs_(E.EN(recip,cdividend), dividend[0], dividend[1]);
_GDF_CString(E.scalar + 0, dividend_scalar, *dividend_scalar_l);
GDF_SCIND_F2C(E.scalar_ind[0], *dividend_scalar_ind);
@@ -4464,8 +4473,8 @@
_GDF_CString(&E.in_fields[0], in_field, *in_field_l);
_GDF_CString(&E.in_fields[1], check_field, *check_field_l);
E.fragment_index = *fragment_index;
- E.windop = *windop;
- E.threshold = _GDF_SetTriplet(E.windop, threshold);
+ E.EN(window,windop) = *windop;
+ E.EN(window,threshold) = _GDF_SetTriplet(E.EN(window,windop), threshold);
_GDF_CString(E.scalar + 0, threshold_scalar, *threshold_scalar_l);
GDF_SCIND_F2C(E.scalar_ind[0], *threshold_scalar_ind);
@@ -4502,8 +4511,8 @@
_GDF_CString(&E.in_fields[0], in_field, *in_field_l);
_GDF_CString(&E.in_fields[1], count_field, *count_field_l);
E.fragment_index = *fragment_index;
- E.count_val = *val;
- E.period = *period;
+ E.EN(mplex,count_val) = *val;
+ E.EN(mplex,period) = *period;
_GDF_CString(E.scalar + 0, val_scalar, *val_scalar_l);
GDF_SCIND_F2C(E.scalar_ind[0], *val_scalar_ind);
_GDF_CString(E.scalar + 1, period_scalar, *period_scalar_l);
@@ -4647,12 +4656,12 @@
dtrace("%i, %p, %i, %i, %p, %i, %g;%g, %p, %i, %i, %g;%g, %p, %i, %i, %g;%g, "
"%p, %i, %i, %g;%g, %p, %i, %i, %g;%g, %p, %i, %i, %g;%g, %p, %i, %i",
*dirfile, field_code, *field_code_l, *poly_ord, in_field, *in_field_l,
- creal(*a0), cimag(*a0), a0_scalar, *a0_scalar_l, *a0_scalar_ind,
- creal(*a1), cimag(*a1), a1_scalar, *a1_scalar_l, *a1_scalar_ind,
- creal(*a2), cimag(*a2), a2_scalar, *a2_scalar_l, *a2_scalar_ind,
- creal(*a3), cimag(*a3), a3_scalar, *a3_scalar_l, *a3_scalar_ind,
- creal(*a4), cimag(*a4), a4_scalar, *a4_scalar_l, *a4_scalar_ind,
- creal(*a5), cimag(*a5), a5_scalar, *a5_scalar_l, *a5_scalar_ind);
+ crealp(a0), cimagp(a0), a0_scalar, *a0_scalar_l, *a0_scalar_ind,
+ crealp(a1), cimagp(a1), a1_scalar, *a1_scalar_l, *a1_scalar_ind,
+ crealp(a2), cimagp(a2), a2_scalar, *a2_scalar_l, *a2_scalar_ind,
+ crealp(a3), cimagp(a3), a3_scalar, *a3_scalar_l, *a3_scalar_ind,
+ crealp(a4), cimagp(a4), a4_scalar, *a4_scalar_l, *a4_scalar_ind,
+ crealp(a5), cimagp(a5), a5_scalar, *a5_scalar_l, *a5_scalar_ind);
memset(&E, 0, sizeof(E));
E.field_type = GD_POLYNOM_ENTRY;
@@ -4669,30 +4678,30 @@
case 5:
_GDF_CString(E.scalar + 5, a5_scalar, *a5_scalar_l);
GDF_SCIND_F2C(E.scalar_ind[5], *a5_scalar_ind);
- gd_cp2ca_(E.ca, 5, a5);
+ gd_cp2cs_(E.EN(polynom,ca)[5], a5);
/* fallthrough */
case 4:
_GDF_CString(E.scalar + 4, a4_scalar, *a4_scalar_l);
GDF_SCIND_F2C(E.scalar_ind[4], *a4_scalar_ind);
- gd_cp2ca_(E.ca, 4, a4);
+ gd_cp2cs_(E.EN(polynom,ca)[4], a4);
/* fallthrough */
case 3:
_GDF_CString(E.scalar + 3, a3_scalar, *a3_scalar_l);
GDF_SCIND_F2C(E.scalar_ind[3], *a3_scalar_ind);
- gd_cp2ca_(E.ca, 3, a3);
+ gd_cp2cs_(E.EN(polynom,ca)[3], a3);
/* fallthrough */
case 2:
_GDF_CString(E.scalar + 2, a2_scalar, *a2_scalar_l);
GDF_SCIND_F2C(E.scalar_ind[2], *a2_scalar_ind);
- gd_cp2ca_(E.ca, 2, a2);
+ gd_cp2cs_(E.EN(polynom,ca)[2], a2);
/* fallthrough */
default:
_GDF_CString(E.scalar + 1, a1_scalar, *a1_scalar_l);
GDF_SCIND_F2C(E.scalar_ind[1], *a1_scalar_ind);
- gd_cp2ca_(E.ca, 1, a1);
+ gd_cp2cs_(E.EN(polynom,ca)[1], a1);
_GDF_CString(E.scalar + 0, a0_scalar, *a0_scalar_l);
GDF_SCIND_F2C(E.scalar_ind[0], *a0_scalar_ind);
- gd_cp2ca_(E.ca, 0, a0);
+ gd_cp2cs_(E.EN(polynom,ca)[0], a0);
}
gd_alter_entry(_GDF_GetDirfile(*dirfile), _GDF_CString(&fc, field_code,
@@ -4725,8 +4734,8 @@
E.field_type = GD_WINDOW_ENTRY;
_GDF_CString(&E.in_fields[0], in_field, *in_field_l);
_GDF_CString(&E.in_fields[1], check_field, *check_field_l);
- E.windop = *windop;
- E.threshold = _GDF_SetTriplet(E.windop, threshold);
+ E.EN(window,windop) = *windop;
+ E.EN(window,threshold) = _GDF_SetTriplet(E.EN(window,windop), threshold);
_GDF_CString(E.scalar + 0, threshold_scalar, *threshold_scalar_l);
GDF_SCIND_F2C(E.scalar_ind[0], *threshold_scalar_ind);
@@ -4937,8 +4946,8 @@
GDF_SCIND_F2C(E.scalar_ind[0], *m1_scalar_ind);
GDF_SCIND_F2C(E.scalar_ind[0 + GD_MAX_LINCOM], *b1_scalar_ind);
- E.m[0] = *m1;
- E.b[0] = *b1;
+ E.EN(lincom,m[0]) = *m1;
+ E.EN(lincom,b[0]) = *b1;
if (n > 1) {
_GDF_CString(E.in_fields + 1, in_field2, *in_field2_l);
@@ -4947,8 +4956,8 @@
GDF_SCIND_F2C(E.scalar_ind[1], *m2_scalar_ind);
GDF_SCIND_F2C(E.scalar_ind[1 + GD_MAX_LINCOM], *b2_scalar_ind);
- E.m[1] = *m2;
- E.b[1] = *b2;
+ E.EN(lincom,m[1]) = *m2;
+ E.EN(lincom,b[1]) = *b2;
}
if (n > 2) {
@@ -4958,8 +4967,8 @@
GDF_SCIND_F2C(E.scalar_ind[2], *m3_scalar_ind);
GDF_SCIND_F2C(E.scalar_ind[2 + GD_MAX_LINCOM], *b3_scalar_ind);
- E.m[2] = *m3;
- E.b[2] = *b3;
+ E.EN(lincom,m[2]) = *m3;
+ E.EN(lincom,b[2]) = *b3;
}
gd_alter_entry(_GDF_GetDirfile(*dirfile), _GDF_CString(&fc, field_code,
@@ -4997,13 +5006,13 @@
dtrace("%i, %p, %i, %i, %p, %i, %g;%g, %p, %i, %i, %g;%g, %p, %i, %i, %p, "
"%i, %g;%g, %p, %i, %i, %g;%g, %p, %i, %i, %p, %i, %g;%g, %p, %i, %i, "
"%g;%g, %p, %i, %i", *dirfile, field_code, *field_code_l, *n_fields,
- in_field1, *in_field1_l, creal(*m1), cimag(*m1), m1_scalar, *m1_scalar_l,
- *m1_scalar_ind, creal(*b1), cimag(*b1), b1_scalar, *b1_scalar_l,
- *b1_scalar_ind, in_field2, *in_field2_l, creal(*m2), cimag(*m2),
- m2_scalar, *m2_scalar_l, *m2_scalar_ind, creal(*b2), cimag(*b2),
+ in_field1, *in_field1_l, crealp(m1), cimagp(m1), m1_scalar, *m1_scalar_l,
+ *m1_scalar_ind, crealp(b1), cimagp(b1), b1_scalar, *b1_scalar_l,
+ *b1_scalar_ind, in_field2, *in_field2_l, crealp(m2), cimagp(m2),
+ m2_scalar, *m2_scalar_l, *m2_scalar_ind, crealp(b2), cimagp(b2),
b2_scalar, *b2_scalar_l, *b2_scalar_ind, in_field3, *in_field3_l,
- creal(*m3), cimag(*m3), m3_scalar, *m3_scalar_l, *m3_scalar_ind,
- creal(*b3), cimag(*b3), b3_scalar, *b3_scalar_l, *b3_scalar_ind);
+ crealp(m3), cimagp(m3), m3_scalar, *m3_scalar_l, *m3_scalar_ind,
+ crealp(b3), cimagp(b3), b3_scalar, *b3_scalar_l, *b3_scalar_ind);
memset(&E, 0, sizeof(E));
E.field_type = GD_LINCOM_ENTRY;
@@ -5016,8 +5025,8 @@
GDF_SCIND_F2C(E.scalar_ind[0], *m1_scalar_ind);
GDF_SCIND_F2C(E.scalar_ind[0 + GD_MAX_LINCOM], *b1_scalar_ind);
- gd_cp2ca_(E.cm, 0, m1);
- gd_cp2ca_(E.cb, 0, b1);
+ gd_cp2cs_(E.EN(lincom,cm)[0], m1);
+ gd_cp2cs_(E.EN(lincom,cb)[0], b1);
if (n > 1) {
_GDF_CString(E.in_fields + 1, in_field2, *in_field2_l);
@@ -5026,8 +5035,8 @@
GDF_SCIND_F2C(E.scalar_ind[1], *m2_scalar_ind);
GDF_SCIND_F2C(E.scalar_ind[1 + GD_MAX_LINCOM], *b2_scalar_ind);
- gd_cp2ca_(E.cm, 1, m2);
- gd_cp2ca_(E.cb, 1, b2);
+ gd_cp2cs_(E.EN(lincom,cm)[1], m2);
+ gd_cp2cs_(E.EN(lincom,cb)[1], b2);
}
if (n > 2) {
@@ -5037,8 +5046,8 @@
GDF_SCIND_F2C(E.scalar_ind[2], *m3_scalar_ind);
GDF_SCIND_F2C(E.scalar_ind[2 + GD_MAX_LINCOM], *b3_scalar_ind);
- gd_cp2ca_(E.cm, 2, m3);
- gd_cp2ca_(E.cb, 2, b3);
+ gd_cp2cs_(E.EN(lincom,cm)[2], m3);
+ gd_cp2cs_(E.EN(lincom,cb)[2], b3);
}
gd_alter_entry(_GDF_GetDirfile(*dirfile), _GDF_CString(&fc, field_code,
@@ -5163,8 +5172,8 @@
E.field_type = GD_MPLEX_ENTRY;
_GDF_CString(&E.in_fields[0], in_field, *in_field_l);
_GDF_CString(&E.in_fields[1], count_field, *count_field_l);
- E.count_val = *val;
- E.period = *period;
+ E.EN(mplex,count_val) = *val;
+ E.EN(mplex,period) = *period;
_GDF_CString(E.scalar + 0, val_scalar, *val_scalar_l);
GDF_SCIND_F2C(E.scalar_ind[0], *val_scalar_ind);
_GDF_CString(E.scalar + 1, period_scalar, *period_scalar_l);
Modified: trunk/getdata/bindings/perl/GetData.xs
===================================================================
--- trunk/getdata/bindings/perl/GetData.xs 2013-12-11 22:35:43 UTC (rev 871)
+++ trunk/getdata/bindings/perl/GetData.xs 2013-12-12 03:33:54 UTC (rev 872)
@@ -1359,7 +1359,8 @@
GDP_PUSHrvavcmp(E.EN(lincom,cm), E.EN(lincom,n_fields));
GDP_PUSHpvn("b");
GDP_PUSHrvavcmp(E.EN(lincom,cb), E.EN(lincom,n_fields));
- sp = gdp_store_scalars(sp, &E, ((1 << E.EN(lincom,n_fields)) - 1) * 9);
+ sp = gdp_store_scalars(sp, &E,
+ ((1 << E.EN(lincom,n_fields)) - 1) * 9);
break;
case GD_LINTERP_ENTRY:
GDP_PUSHpvn("in_fields");
Modified: trunk/getdata/configure.ac
===================================================================
--- trunk/getdata/configure.ac 2013-12-11 22:35:43 UTC (rev 871)
+++ trunk/getdata/configure.ac 2013-12-12 03:33:54 UTC (rev 872)
@@ -929,11 +929,20 @@
fi
fi
-dnl matlab
+dnl php
if test "x$make_phpbindings" = "xyes"; then
echo
echo "*** Configuring PHP bindings"
echo
+ AC_MSG_CHECKING([whether C99 is supported])
+ if test "x$disable_c99" = "xno"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ make_phpbindings=no
+ fi
+fi
+if test "x$make_phpbindings" = "xyes"; then
GD_PHP
if test "x$have_php" = "xno"; then
make_phpbindings=no
Modified: trunk/getdata/src/common.c
===================================================================
--- trunk/getdata/src/common.c 2013-12-11 22:35:43 UTC (rev 871)
+++ trunk/getdata/src/common.c 2013-12-12 03:33:54 UTC (rev 872)
@@ -764,7 +764,7 @@
for (i = 0; i < n_read; i++) { \
const t d = ((t *)data)[2 * i] * ((t *)data)[2 * i] + \
((t *)data)[2 * i + 1] * ((t *)data)[2 * i + 1]; \
- ((t *)data)[2 * i] = (t)((dividend[0] * ((t *)data)[2 * i] - \
+ ((t *)data)[2 * i] = (t)((dividend[0] * ((t *)data)[2 * i] + \
dividend[1] * ((t *)data)[2 * i + 1]) / d); \
((t *)data)[2 * i + 1] = (t)((dividend[1] * ((t *)data)[2 * i] - \
dividend[0] * ((t *)data)[2 * i]) / d); \
Modified: trunk/getdata/src/entry.c
===================================================================
--- trunk/getdata/src/entry.c 2013-12-11 22:35:43 UTC (rev 871)
+++ trunk/getdata/src/entry.c 2013-12-12 03:33:54 UTC (rev 872)
@@ -209,21 +209,24 @@
/* resolve non-literal scalars */
int _GD_CalculateEntry(DIRFILE *restrict D, gd_entry_t *restrict E, int err)
{
- int i, cs = 0;
+ int i, e = 0, cs = 0;
dtrace("%p, %p, %i", D, E, err);
switch(E->field_type) {
case GD_RAW_ENTRY:
- _GD_GetScalar(D, E, 0, GD_UINT_TYPE, &E->EN(raw,spf), err);
+ e = _GD_GetScalar(D, E, 0, GD_UINT_TYPE, &E->EN(raw,spf), err);
break;
case GD_POLYNOM_ENTRY:
for (i = 0; i <= E->EN(polynom,poly_ord); ++i) {
- _GD_GetScalar(D, E, i, GD_COMPLEX128, &E->EN(polynom,ca)[i], err);
- E->EN(polynom,a)[i] = creal(E->EN(polynom,ca)[i]);
+ if (_GD_GetScalar(D, E, i, GD_COMPLEX128, &E->EN(polynom,ca)[i], err))
+ e = 1;
+ else {
+ E->EN(polynom,a)[i] = creal(E->EN(polynom,ca)[i]);
- if (!cs && cimag(E->EN(polynom,ca)[i]))
- cs = 1;
+ if (!cs && cimag(E->EN(polynom,ca)[i]))
+ cs = 1;
+ }
if (D->error)
break;
@@ -231,55 +234,67 @@
break;
case GD_LINCOM_ENTRY:
for (i = 0; i < E->EN(lincom,n_fields); ++i) {
- _GD_GetScalar(D, E, i, GD_COMPLEX128, &E->EN(lincom,cm)[i], err);
- E->EN(lincom,m)[i] = creal(E->EN(lincom,cm)[i]);
+ if (_GD_GetScalar(D, E, i, GD_COMPLEX128, &E->EN(lincom,cm)[i], err))
+ e = 1;
+ else {
+ E->EN(lincom,m)[i] = creal(E->EN(lincom,cm)[i]);
- if (!cs && cimag(E->EN(lincom,cm)[i]))
- cs = 1;
+ if (!cs && cimag(E->EN(lincom,cm)[i]))
+ cs = 1;
+ }
- _GD_GetScalar(D, E, i + GD_MAX_LINCOM, GD_COMPLEX128,
- &E->EN(lincom,cb)[i], err);
- E->EN(lincom,b)[i] = creal(E->EN(lincom,cb)[i]);
+ if (_GD_GetScalar(D, E, i + GD_MAX_LINCOM, GD_COMPLEX128,
+ &E->EN(lincom,cb)[i], err))
+ {
+ e = 1;
+ } else {
+ E->EN(lincom,b)[i] = creal(E->EN(lincom,cb)[i]);
- if (!cs && cimag(E->EN(lincom,cb)[i]))
- cs = 1;
+ if (!cs && cimag(E->EN(lincom,cb)[i]))
+ cs = 1;
+ }
if (D->error)
break;
}
break;
case GD_RECIP_ENTRY:
- _GD_GetScalar(D, E, 0, GD_COMPLEX128, &E->EN(recip,cdividend), err);
- E->EN(recip,dividend) = creal(E->EN(recip,cdividend));
- if (cimag(E->EN(recip,cdividend)))
- cs = 1;
+ if (_GD_GetScalar(D, E, 0, GD_COMPLEX128, &E->EN(recip,cdividend), err))
+ e = 1;
+ else {
+ E->EN(recip,dividend) = creal(E->EN(recip,cdividend));
+ if (cimag(E->EN(recip,cdividend)))
+ cs = 1;
+ }
break;
case GD_BIT_ENTRY:
case GD_SBIT_ENTRY:
- _GD_GetScalar(D, E, 0, GD_INT_TYPE, &E->EN(bit,bitnum), err);
- _GD_GetScalar(D, E, 1, GD_INT_TYPE, &E->EN(bit,numbits), err);
+ e = _GD_GetScalar(D, E, 0, GD_INT_TYPE, &E->EN(bit,bitnum), err);
+ e |= _GD_GetScalar(D, E, 1, GD_INT_TYPE, &E->EN(bit,numbits), err);
break;
case GD_PHASE_ENTRY:
- _GD_GetScalar(D, E, 0, GD_INT64, &E->EN(phase,shift), err);
+ e = _GD_GetScalar(D, E, 0, GD_INT64, &E->EN(phase,shift), err);
break;
case GD_WINDOW_ENTRY:
switch (E->EN(window,windop)) {
case GD_WINDOP_EQ:
case GD_WINDOP_NE:
- _GD_GetScalar(D, E, 0, GD_INT64, &E->EN(window,threshold.i), err);
+ e = _GD_GetScalar(D, E, 0, GD_INT64, &E->EN(window,threshold.i), err);
break;
case GD_WINDOP_SET:
case GD_WINDOP_CLR:
- _GD_GetScalar(D, E, 0, GD_UINT64, &E->EN(window,threshold.u), err);
+ e = _GD_GetScalar(D, E, 0, GD_UINT64, &E->EN(window,threshold.u),
+ err);
break;
default:
- _GD_GetScalar(D, E, 0, GD_FLOAT64, &E->EN(window,threshold.r), err);
+ e = _GD_GetScalar(D, E, 0, GD_FLOAT64, &E->EN(window,threshold.r),
+ err);
break;
}
break;
case GD_MPLEX_ENTRY:
- _GD_GetScalar(D, E, 0, GD_INT_TYPE, &E->EN(mplex,count_val), err);
- _GD_GetScalar(D, E, 1, GD_INT_TYPE, &E->EN(mplex,period), err);
+ e = _GD_GetScalar(D, E, 0, GD_INT_TYPE, &E->EN(mplex,count_val), err);
+ e |= _GD_GetScalar(D, E, 1, GD_INT_TYPE, &E->EN(mplex,period), err);
break;
case GD_NO_ENTRY:
case GD_LINTERP_ENTRY:
@@ -293,7 +308,7 @@
break;
}
- if (!D->error)
+ if (!e)
E->flags |= GD_EN_CALC;
if (cs)
@@ -301,8 +316,8 @@
else
E->flags &= ~GD_EN_COMPSCAL;
- dreturn("%i", (E->flags & GD_EN_CALC) ? 1 : 0);
- return (E->flags & GD_EN_CALC) ? 1 : 0;
+ dreturn("%i", !e);
+ return !e;
}
char* gd_raw_filename(DIRFILE* D, const char* field_code_in) gd_nothrow
Modified: trunk/getdata/src/getdata.c
===================================================================
--- trunk/getdata/src/getdata.c 2013-12-11 22:35:43 UTC (rev 871)
+++ trunk/getdata/src/getdata.c 2013-12-12 03:33:54 UTC (rev 872)
@@ -386,12 +386,90 @@
#ifdef GD_NO_C99_API
#define POLYNOMC(t) \
switch (n) { \
- case 2: POLYNOM2(t,2 * npts); break; \
- case 3: POLYNOM3(t,2 * npts); break; \
- case 4: POLYNOM4(t,2 * npts); break; \
- case 5: POLYNOM5(t,2 * npts); break; \
+ case 2: POLYNOMC2(t,npts); break; \
+ case 3: POLYNOMC3(t,npts); break; \
+ case 4: POLYNOMC4(t,npts); break; \
+ case 5: POLYNOMC5(t,npts); break; \
default: _GD_InternalError(D); \
}
+
+#define POLYNOMC5(t,npts) \
+ do { \
+ for (i = 0; i < npts; i++) { \
+ const double x = ((t*)data)[2 * i]; \
+ const double x2 = x * x; \
+ const double x3 = x2 * x; \
+ const double x4 = x3 * x; \
+ const double x5 = x4 * x; \
+ const double y = ((t*)data)[2 * i + 1]; \
+ const double y2 = y * y; \
+ const double y3 = y2 * y; \
+ const double y4 = y3 * y; \
+ const double y5 = y4 * y; \
+ ((t*)data)[2 * i] = (t)( \
+ a[5] * (x5 - 10 * x3 * y2 + 5 * x * y4) \
+ - a[4] * (x4 - 6 * x2 * y2 + y4) - a[3] * (x3 - 3 * x * y2) \
+ + a[2] * (x2 - y2) + a[1] * x + a[0] \
+ ); \
+ ((t*)data)[2 * i + 1] = (t)( \
+ a[5] * (5 * x4 * y - 10 * x3 * y2 + y5) \
+ + a[4] * (4 * x3 * y - 4 * x * y3) + a[3] * (3 * x2 * y - y3) \
+ + a[2] * 2 * x * y + a[1] * y \
+ ); \
+ } \
+ } while (0)
+
+#define POLYNOMC4(t,npts) \
+ do { \
+ for (i = 0; i < npts; i++) { \
+ const double x = ((t*)data)[2 * i]; \
+ const double x2 = x * x; \
+ const double x3 = x2 * x; \
+ const double x4 = x3 * x; \
+ const double y = ((t*)data)[2 * i + 1]; \
+ const double y2 = y * y; \
+ const double y3 = y2 * y; \
+ const double y4 = y3 * y; \
+ ((t*)data)[2 * i] = (t)( \
+ a[4] * (x4 - 6 * x2 * y2 + y4) + a[3] * (x3 - 3 * x * y2) \
+ + a[2] * (x2 - y2) + a[1] * x + a[0] \
+ ); \
+ ((t*)data)[2 * i + 1] = (t)( \
+ a[4] * (4 * x3 * y - 4 * x * y3) + a[3] * (3 * x2 * y - y3) \
+ + a[2] * 2 * x * y + a[1] * y \
+ ); \
+ } \
+ } while (0)
+
+#define POLYNOMC3(t,npts) \
+ do { \
+ for (i = 0; i < npts; i++) { \
+ const double x = ((t*)data)[2 * i]; \
+ const double x2 = x * x; \
+ const double x3 = x2 * x; \
+ const double y = ((t*)data)[2 * i + 1]; \
+ const double y2 = y * y; \
+ const double y3 = y2 * y; \
+ ((t*)data)[2 * i] = (t)( \
+ a[3] * (x3 - 3 * x * y2) + a[2] * (x2 - y2) + a[1] * x + a[0] \
+ ); \
+ ((t*)data)[2 * i + 1] = (t)( \
+ a[3] * (3 * x2 * y - y3) + a[2] * 2 * x * y + a[1] * y \
+ ); \
+ } \
+ } while (0)
+
+#define POLYNOMC2(t,npts) \
+ do { \
+ for (i = 0; i < npts; i++) { \
+ const double x = ((t*)data)[2 * i]; \
+ const double x2 = x * x; \
+ const double y = ((t*)data)[2 * i + 1]; \
+ const double y2 = y * y; \
+ ((t*)data)[2 * i] = (t)(a[2] * (x2 - y2) + a[1] * x + a[0]); \
+ ((t*)data)[2 * i + 1] = (t)(a[2] * 2 * x * y + a[1] * y); \
+ } \
+ } while (0)
#else
#define POLYNOMC(t) POLYNOM(complex t)
#endif
@@ -442,7 +520,11 @@
}
#ifdef GD_NO_C99_API
-#undef POLYNOMC
+#undef POLYNOMC5
+#undef POLYNOMC4
+#undef POLYNOMC3
+#undef POLYNOMC2
+#undef POLYNOMC1
#define POLYNOMC5(t,npts) \
do { \
@@ -545,15 +627,6 @@
); \
} \
} while (0)
-
-#define POLYNOMC(t) \
- switch (n) { \
- case 2: POLYNOMC2(t,npts); break; \
- case 3: POLYNOMC3(t,npts); break; \
- case 4: POLYNOMC4(t,npts); break; \
- case 5: POLYNOMC5(t,npts); break; \
- default: _GD_InternalError(D); \
- }
#endif
@@ -743,9 +816,9 @@
const int i2 = 2 * (i * spfB / spfA); \
const t x = ((t*)A)[2 * i]; \
const t y = ((t*)A)[2 * i + 1]; \
- const double d = B[i2] * B[i2] - B[i2 + 1] * B[i2 + 1]; \
+ const double d = B[i2] * B[i2] + B[i2 + 1] * B[i2 + 1]; \
((t*)A)[2 * i] = (t)((x * B[i2] + y * B[i2 + 1]) / d); \
- ((t*)A)[2 * i + 1] = (t)((x * B[i2] - y * B[i2 + 1]) / d); \
+ ((t*)A)[2 * i + 1] = (t)((y * B[i2] - x * B[i2 + 1]) / d); \
} \
} while (0)
Modified: trunk/getdata/src/internal.h
===================================================================
--- trunk/getdata/src/internal.h 2013-12-11 22:35:43 UTC (rev 871)
+++ trunk/getdata/src/internal.h 2013-12-12 03:33:54 UTC (rev 872)
@@ -155,13 +155,15 @@
/* imaginary part of (*z) */
# define cimagp(z) cimag(z)
/* a pointer to element i of GD_DCOMPLEXP_t array a */
-# define gd_cap_(a,i) ((GD_DCOMPLEXP_t)(a + 2 * i))
+# define gd_cap_(a,i) (((GD_DCOMPLEXP_t)(a)) + 2 * i)
/* a pointer to a complex scalar */
# define gd_csp_(a) ((GD_DCOMPLEXP_t)a)
/* assign real two-element array b to scalar a */
# define gd_ra2cs_(a,b) gd_cs2cs_(a,b)
/* assign scalar b to scalar a */
# define gd_cs2cs_(a,b) do { (a)[0] = (b)[0]; (a)[1] = (b)[1]; } while(0)
+/* assign scalar *b to scalar a */
+# define gd_cp2cs_(a,b) gd_cs2cs_(a,b)
/* assign scalar b to scalar (*a) */
# define gd_cs2cp_(a,b) gd_cs2cs_(a,b)
/* assign b[i] to scalar a */
@@ -206,15 +208,16 @@
# define gd_csp_(a) (&(a))
# define gd_ra2cs_(a,b) a = *((double complex*)(b))
# define gd_cs2cs_(a,b) a = b
-# define gd_cs2cp_(a,b) *a = b
+# define gd_cp2cs_(a,b) a = *(b)
+# define gd_cs2cp_(a,b) *(a) = b
# define gd_ca2cs_(a,b,i) a = b[i]
# define gd_cp2ca_(a,i,b) (a)[i] = *(b)
# define gd_li2cs_(a,x,y) a = (x + _Complex_I * y)
-# define gd_li2cp_(a,x,y) *a = (x + _Complex_I * y)
+# define gd_li2cp_(a,x,y) *(a) = (x + _Complex_I * y)
# define gd_po2cs_(a,r,p) a = (r) * cexp(p)
-# define gd_po2cp_(a,r,p) *a = (r) * cexp(p)
+# define gd_po2cp_(a,r,p) *(a) = (r) * cexp(p)
# define gd_rs2cs_(a,b) a = b
-# define gd_rs2cp_(a,b) *a = b
+# define gd_rs2cp_(a,b) *(a) = b
# define gd_cs2ca_(a,i,b,t) ((complex t*)a)[i] = (complex t)(b)
# define gd_rs2ca_(a,i,b,t) gd_cs2ca_(a,i,b,t)
# define gd_ccmpl_(a,x,y) (a == (x + _Complex_I * y))
Modified: trunk/getdata/src/mod.c
===================================================================
--- trunk/getdata/src/mod.c 2013-12-11 22:35:43 UTC (rev 871)
+++ trunk/getdata/src/mod.c 2013-12-12 03:33:54 UTC (rev 872)
@@ -123,7 +123,7 @@
if (D->error)
r |= GD_AS_ERROR;
- dreturn("%i", r);
+ dreturn("0x%X", r);
return r;
}
Modified: trunk/getdata/src/name.c
===================================================================
--- trunk/getdata/src/name.c 2013-12-11 22:35:43 UTC (rev 871)
+++ trunk/getdata/src/name.c 2013-12-12 03:33:54 UTC (rev 872)
@@ -428,8 +428,6 @@
unsigned u;
int i;
- dtrace("%p, %p, %i", D, rdat, perform);
-
/* look for meta fields */
const int search_meta = (rdat->E->e->n_meta != -1);
@@ -447,6 +445,8 @@
const int amode = (update_aliases ? GD_UPDU : 0) |
(perform ? 0 : GD_UPDI);
+ dtrace("%p, %p, %i", D, rdat, perform);
+
/* reset the code count */
rdat->n_code = 0;
@@ -454,7 +454,7 @@
if (update_vectors)
switch (D->entry[u]->field_type) {
case GD_LINCOM_ENTRY:
- for (i = 0; i < D->entry[u]->n_fields; ++i) {
+ for (i = 0; i < D->entry[u]->EN(lincom,n_fields); ++i) {
if (_GD_UpdateInField(D, D->entry[u], rdat, i, search_meta, mode)) {
dreturn("%i", -1);
return -1;
Modified: trunk/getdata/test/alter_clincom.c
===================================================================
--- trunk/getdata/test/alter_clincom.c 2013-12-11 22:35:43 UTC (rev 871)
+++ trunk/getdata/test/alter_clincom.c 2013-12-12 03:33:54 UTC (rev 872)
@@ -68,7 +68,7 @@
gd_entry(D, "lincom", &E);
CHECKX(E.flags, GD_EN_COMPSCAL | GD_EN_CALC);
- CHECKI(E.n_fields, 2);
+ CHECKI(E.EN(lincom,n_fields), 2);
#ifdef GD_NO_C99_API
CHECKC(E.EN(lincom,cm)[0], m);
CHECKC(E.EN(lincom,cm)[1], m + 2);
Modified: trunk/getdata/test/alter_cpolynom_null.c
===================================================================
--- trunk/getdata/test/alter_cpolynom_null.c 2013-12-11 22:35:43 UTC (rev 871)
+++ trunk/getdata/test/alter_cpolynom_null.c 2013-12-12 03:33:54 UTC (rev 872)
@@ -38,7 +38,7 @@
"polynom POLYNOM data 1;2 2;3 1;9\n";
int fd, i, ret, error, n, error2, r = 0;
gd_entry_t E;
-#ifdef GD_NO_C89_API
+#ifdef GD_NO_C99_API
const double a[2][2] = {{1, 2}, {2, 3}};
#endif
DIRFILE *D;
Modified: trunk/getdata/test/alter_entry_recode_recalc.c
===================================================================
--- trunk/getdata/test/alter_entry_recode_recalc.c 2013-12-11 22:35:43 UTC (rev 871)
+++ trunk/getdata/test/alter_entry_recode_recalc.c 2013-12-12 03:33:54 UTC (rev 872)
@@ -70,6 +70,9 @@
ret = gd_alter_entry(D, "data", &E, 1);
error = gd_error(D);
n = gd_nframes(D);
+ CHECKI(error, 0);
+ CHECKI(n, 32);
+ CHECKI(ret, 0);
gd_discard(D);
@@ -87,13 +90,9 @@
r = 1;
}
-// unlink(data);
+ unlink(data);
unlink(format);
rmdir(filedir);
- CHECKI(error, 0);
- CHECKI(n, 32);
- CHECKI(ret, 0);
-
return r;
}
Modified: trunk/getdata/test/alter_entry_scalar1.c
===================================================================
--- trunk/getdata/test/alter_entry_scalar1.c 2013-12-11 22:35:43 UTC (rev 871)
+++ trunk/getdata/test/alter_entry_scalar1.c 2013-12-12 03:33:54 UTC (rev 872)
@@ -48,8 +48,8 @@
memset(&E, 0, sizeof(E));
E.field_type = GD_BIT_ENTRY;
- E.bitnum = 4;
- E.numbits = 3;
+ E.EN(bit,bitnum) = 4;
+ E.EN(bit,numbits) = 3;
E.in_fields[0] = "in";
E.scalar[0] = "";
Modified: trunk/getdata/test/alter_entry_scalar3c.c
===================================================================
--- trunk/getdata/test/alter_entry_scalar3c.c 2013-12-11 22:35:43 UTC (rev 871)
+++ trunk/getdata/test/alter_entry_scalar3c.c 2013-12-12 03:33:54 UTC (rev 872)
@@ -48,8 +48,8 @@
memset(&E, 0, sizeof(E));
E.field_type = GD_BIT_ENTRY;
- E.bitnum = -1;
- E.numbits = 3;
+ E.EN(bit,bitnum) = -1;
+ E.EN(bit,numbits) = 3;
E.in_fields[0] = "in";
ret = gd_alter_entry(D, "data", &E, 0);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
