tidy up your spreadsheet module 03/9403/5
Antoine ELIAS [Thu, 11 Oct 2012 14:59:36 +0000 (16:59 +0200)]
Change-Id: I3582714f7c700a743ab9ed266403965cea436d4b

41 files changed:
scilab/modules/spreadsheet/Makefile.am
scilab/modules/spreadsheet/Makefile.in
scilab/modules/spreadsheet/sci_gateway/c/gw_csv_helpers.c [moved from scilab/modules/spreadsheet/sci_gateway/cpp/gw_csv_helpers.cpp with 97% similarity]
scilab/modules/spreadsheet/sci_gateway/c/gw_csv_helpers.h [moved from scilab/modules/spreadsheet/sci_gateway/cpp/gw_csv_helpers.h with 100% similarity]
scilab/modules/spreadsheet/sci_gateway/c/sci_csvDefault.c [moved from scilab/modules/spreadsheet/sci_gateway/cpp/sci_csvDefault.cpp with 98% similarity]
scilab/modules/spreadsheet/sci_gateway/c/sci_csvIsnum.c [moved from scilab/modules/spreadsheet/sci_gateway/cpp/sci_csvIsnum.cpp with 95% similarity]
scilab/modules/spreadsheet/sci_gateway/c/sci_csvRead.c [moved from scilab/modules/spreadsheet/sci_gateway/cpp/sci_csvRead.cpp with 98% similarity]
scilab/modules/spreadsheet/sci_gateway/c/sci_csvStringToDouble.c [moved from scilab/modules/spreadsheet/sci_gateway/cpp/sci_csvStringToDouble.cpp with 94% similarity]
scilab/modules/spreadsheet/sci_gateway/c/sci_csvTextScan.c [moved from scilab/modules/spreadsheet/sci_gateway/cpp/sci_csvTextScan.cpp with 98% similarity]
scilab/modules/spreadsheet/sci_gateway/c/sci_csvWrite.c [moved from scilab/modules/spreadsheet/sci_gateway/cpp/sci_csvWrite.cpp with 98% similarity]
scilab/modules/spreadsheet/sci_gateway/cpp/gw_csv_tools.h [deleted file]
scilab/modules/spreadsheet/spreadsheet.vcxproj
scilab/modules/spreadsheet/spreadsheet.vcxproj.filters
scilab/modules/spreadsheet/src/c/checkCsvWriteFormat.c [moved from scilab/modules/spreadsheet/src/cpp/checkCsvWriteFormat.c with 100% similarity]
scilab/modules/spreadsheet/src/c/checkCsvWriteFormat.h [moved from scilab/modules/spreadsheet/src/cpp/checkCsvWriteFormat.h with 100% similarity]
scilab/modules/spreadsheet/src/c/csvDefault.c [moved from scilab/modules/spreadsheet/src/cpp/csvDefault.c with 78% similarity]
scilab/modules/spreadsheet/src/c/csvDefault.h [moved from scilab/modules/spreadsheet/src/cpp/csvDefault.h with 100% similarity]
scilab/modules/spreadsheet/src/c/csvIsnum.c [moved from scilab/modules/spreadsheet/src/cpp/csvIsnum.c with 100% similarity]
scilab/modules/spreadsheet/src/c/csvIsnum.h [moved from scilab/modules/spreadsheet/src/cpp/csvIsnum.h with 100% similarity]
scilab/modules/spreadsheet/src/c/csvRead.c [moved from scilab/modules/spreadsheet/src/cpp/csvRead.c with 100% similarity]
scilab/modules/spreadsheet/src/c/csvRead.h [moved from scilab/modules/spreadsheet/src/cpp/csvRead.h with 100% similarity]
scilab/modules/spreadsheet/src/c/csvWrite.c [moved from scilab/modules/spreadsheet/src/cpp/csvWrite.c with 86% similarity]
scilab/modules/spreadsheet/src/c/csvWrite.h [moved from scilab/modules/spreadsheet/src/cpp/csvWrite.h with 100% similarity]
scilab/modules/spreadsheet/src/c/csv_complex.c [moved from scilab/modules/spreadsheet/src/cpp/csv_complex.c with 100% similarity]
scilab/modules/spreadsheet/src/c/csv_complex.h [moved from scilab/modules/spreadsheet/src/cpp/csv_complex.h with 100% similarity]
scilab/modules/spreadsheet/src/c/csv_strsubst.c [moved from scilab/modules/spreadsheet/src/cpp/csv_strsubst.cpp with 84% similarity]
scilab/modules/spreadsheet/src/c/csv_strsubst.h [moved from scilab/modules/spreadsheet/src/cpp/csv_strsubst.h with 100% similarity]
scilab/modules/spreadsheet/src/c/getRange.c [moved from scilab/modules/spreadsheet/src/cpp/getRange.c with 100% similarity]
scilab/modules/spreadsheet/src/c/getRange.h [moved from scilab/modules/spreadsheet/src/cpp/getRange.h with 100% similarity]
scilab/modules/spreadsheet/src/c/latintoutf.c [moved from scilab/modules/spreadsheet/src/cpp/latintoutf.c with 92% similarity]
scilab/modules/spreadsheet/src/c/latintoutf.h [moved from scilab/modules/spreadsheet/src/cpp/latintoutf.h with 100% similarity]
scilab/modules/spreadsheet/src/c/splitLine.c [moved from scilab/modules/spreadsheet/src/cpp/splitLine.c with 100% similarity]
scilab/modules/spreadsheet/src/c/splitLine.h [moved from scilab/modules/spreadsheet/src/cpp/splitLine.h with 100% similarity]
scilab/modules/spreadsheet/src/c/stringToComplex.c [moved from scilab/modules/spreadsheet/src/cpp/stringToComplex.c with 100% similarity]
scilab/modules/spreadsheet/src/c/stringToComplex.h [moved from scilab/modules/spreadsheet/src/cpp/stringToComplex.h with 100% similarity]
scilab/modules/spreadsheet/src/c/stringsToDoubles.c [moved from scilab/modules/spreadsheet/src/cpp/stringsToDoubles.c with 96% similarity]
scilab/modules/spreadsheet/src/c/stringsToDoubles.h [moved from scilab/modules/spreadsheet/src/cpp/stringsToDoubles.h with 100% similarity]
scilab/modules/spreadsheet/src/c/utftolatin.c [moved from scilab/modules/spreadsheet/src/cpp/utftolatin.c with 100% similarity]
scilab/modules/spreadsheet/src/c/utftolatin.h [moved from scilab/modules/spreadsheet/src/cpp/utftolatin.h with 100% similarity]
scilab/modules/spreadsheet/tests/nonreg_tests/ticket_472.dia.ref
scilab/modules/spreadsheet/tests/nonreg_tests/ticket_472.tst

index 76771c7..7098b38 100644 (file)
@@ -4,22 +4,24 @@
 # This file is distributed under the same license as the Scilab package.
 
 
-SPREADSHEET_C_SOURCES = src/c/xls.c \
-src/cpp/checkCsvWriteFormat.c \
-src/cpp/csv_complex.c \
-src/cpp/csvDefault.c \
-src/cpp/csvIsnum.c \
-src/cpp/csvRead.c \
-src/cpp/csv_strsubst.cpp \
-src/cpp/csvWrite.c \
-src/cpp/getRange.c \
-src/cpp/latintoutf.c \
-src/cpp/splitLine.c \
-src/cpp/stringsToDoubles.c \
-src/cpp/stringToComplex.c \
-src/cpp/utftolatin.c
-
-RIPOLE_SOURCES = src/c/ripole/olestream-unwrap.c \
+SPREADSHEET_C_SOURCES = \
+src/c/xls.c \
+src/c/checkCsvWriteFormat.c \
+src/c/csv_complex.c \
+src/c/csvDefault.c \
+src/c/csvIsnum.c \
+src/c/csvRead.c \
+src/c/csv_strsubst.c \
+src/c/csvWrite.c \
+src/c/getRange.c \
+src/c/latintoutf.c \
+src/c/splitLine.c \
+src/c/stringsToDoubles.c \
+src/c/stringToComplex.c \
+src/c/utftolatin.c
+
+RIPOLE_SOURCES = \
+src/c/ripole/olestream-unwrap.c \
 src/c/ripole/pldstr.c \
 src/c/ripole/ole.c \
 src/c/ripole/bytedecoders.c \
@@ -27,39 +29,38 @@ src/c/ripole/logger.c \
 src/c/ripole/ripole.c \
 src/c/ripole/bt-int.c
 
-
-GATEWAY_C_SOURCES = sci_gateway/c/gw_spreadsheet.c \
+GATEWAY_C_SOURCES = \
+sci_gateway/c/gw_spreadsheet.c \
 sci_gateway/c/sci_xls_read.c \
-sci_gateway/c/sci_xls_open.c
-
-GATEWAY_CPP_SOURCES = sci_gateway/cpp/gw_csv_helpers.cpp \
-sci_gateway/cpp/sci_csvDefault.cpp \
-sci_gateway/cpp/sci_csvIsnum.cpp \
-sci_gateway/cpp/sci_csvRead.cpp \
-sci_gateway/cpp/sci_csvStringToDouble.cpp \
-sci_gateway/cpp/sci_csvTextScan.cpp \
-sci_gateway/cpp/sci_csvWrite.cpp
-
-libscispreadsheet_la_CPPFLAGS = -I$(srcdir)/includes/ \
-                               -I$(srcdir)/src/c/ \
-                               -I$(srcdir)/src/cpp/ \
-                               -I$(srcdir)/src/c/ripole \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
-                               -I$(top_srcdir)/modules/localization/includes/ \
-                               -I$(top_srcdir)/modules/output_stream/includes/ \
-                               -I$(top_srcdir)/modules/io/includes/ \
-                               -I$(top_srcdir)/modules/string/src/c/ \
-                               -I$(top_srcdir)/modules/string/includes/ \
-                               -I$(top_srcdir)/modules/api_scilab/includes/ \
-                               -I$(top_srcdir)/modules/fileio/includes/ \
-                               $(AM_CPPFLAGS)
+sci_gateway/c/sci_xls_open.c \
+sci_gateway/c/gw_csv_helpers.c \
+sci_gateway/c/sci_csvDefault.c \
+sci_gateway/c/sci_csvIsnum.c \
+sci_gateway/c/sci_csvRead.c \
+sci_gateway/c/sci_csvStringToDouble.c \
+sci_gateway/c/sci_csvTextScan.c \
+sci_gateway/c/sci_csvWrite.c
+
+libscispreadsheet_la_CPPFLAGS = \
+-I$(srcdir)/includes/ \
+-I$(srcdir)/src/c/ \
+-I$(srcdir)/src/c/ripole \
+-I$(top_srcdir)/libs/MALLOC/includes/ \
+-I$(top_srcdir)/modules/localization/includes/ \
+-I$(top_srcdir)/modules/output_stream/includes/ \
+-I$(top_srcdir)/modules/io/includes/ \
+-I$(top_srcdir)/modules/string/src/c/ \
+-I$(top_srcdir)/modules/string/includes/ \
+-I$(top_srcdir)/modules/api_scilab/includes/ \
+-I$(top_srcdir)/modules/fileio/includes/ \
+$(AM_CPPFLAGS)
 
 pkglib_LTLIBRARIES = libscispreadsheet.la
 noinst_LTLIBRARIES = libscispreadsheet-algo.la
 
 
-libscispreadsheet_algo_la_SOURCES = $(SPREADSHEET_C_SOURCES) $(RIPOLE_SOURCES) $(SPREADSHEET_CPP_SOURCES)
-libscispreadsheet_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
+libscispreadsheet_algo_la_SOURCES = $(SPREADSHEET_C_SOURCES) $(RIPOLE_SOURCES)
+libscispreadsheet_la_SOURCES = $(GATEWAY_C_SOURCES)
 libscispreadsheet_algo_la_CPPFLAGS = $(libscispreadsheet_la_CPPFLAGS)
 
 # For the code check (splint)
index 2624c1c..c785e7d 100644 (file)
@@ -161,15 +161,15 @@ libscispreadsheet_algo_la_OBJECTS =  \
 libscispreadsheet_la_DEPENDENCIES = libscispreadsheet-algo.la
 am__objects_3 = libscispreadsheet_la-gw_spreadsheet.lo \
        libscispreadsheet_la-sci_xls_read.lo \
-       libscispreadsheet_la-sci_xls_open.lo
-am__objects_4 = libscispreadsheet_la-gw_csv_helpers.lo \
+       libscispreadsheet_la-sci_xls_open.lo \
+       libscispreadsheet_la-gw_csv_helpers.lo \
        libscispreadsheet_la-sci_csvDefault.lo \
        libscispreadsheet_la-sci_csvIsnum.lo \
        libscispreadsheet_la-sci_csvRead.lo \
        libscispreadsheet_la-sci_csvStringToDouble.lo \
        libscispreadsheet_la-sci_csvTextScan.lo \
        libscispreadsheet_la-sci_csvWrite.lo
-am_libscispreadsheet_la_OBJECTS = $(am__objects_3) $(am__objects_4)
+am_libscispreadsheet_la_OBJECTS = $(am__objects_3)
 libscispreadsheet_la_OBJECTS = $(am_libscispreadsheet_la_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
@@ -184,15 +184,6 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-       --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-       --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-       $(LDFLAGS) -o $@
 SOURCES = $(libscispreadsheet_algo_la_SOURCES) \
        $(libscispreadsheet_la_SOURCES)
 DIST_SOURCES = $(libscispreadsheet_algo_la_SOURCES) \
@@ -460,22 +451,24 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SPREADSHEET_C_SOURCES = src/c/xls.c \
-src/cpp/checkCsvWriteFormat.c \
-src/cpp/csv_complex.c \
-src/cpp/csvDefault.c \
-src/cpp/csvIsnum.c \
-src/cpp/csvRead.c \
-src/cpp/csv_strsubst.cpp \
-src/cpp/csvWrite.c \
-src/cpp/getRange.c \
-src/cpp/latintoutf.c \
-src/cpp/splitLine.c \
-src/cpp/stringsToDoubles.c \
-src/cpp/stringToComplex.c \
-src/cpp/utftolatin.c
-
-RIPOLE_SOURCES = src/c/ripole/olestream-unwrap.c \
+SPREADSHEET_C_SOURCES = \
+src/c/xls.c \
+src/c/checkCsvWriteFormat.c \
+src/c/csv_complex.c \
+src/c/csvDefault.c \
+src/c/csvIsnum.c \
+src/c/csvRead.c \
+src/c/csv_strsubst.c \
+src/c/csvWrite.c \
+src/c/getRange.c \
+src/c/latintoutf.c \
+src/c/splitLine.c \
+src/c/stringsToDoubles.c \
+src/c/stringToComplex.c \
+src/c/utftolatin.c
+
+RIPOLE_SOURCES = \
+src/c/ripole/olestream-unwrap.c \
 src/c/ripole/pldstr.c \
 src/c/ripole/ole.c \
 src/c/ripole/bytedecoders.c \
@@ -483,36 +476,36 @@ src/c/ripole/logger.c \
 src/c/ripole/ripole.c \
 src/c/ripole/bt-int.c
 
-GATEWAY_C_SOURCES = sci_gateway/c/gw_spreadsheet.c \
+GATEWAY_C_SOURCES = \
+sci_gateway/c/gw_spreadsheet.c \
 sci_gateway/c/sci_xls_read.c \
-sci_gateway/c/sci_xls_open.c
-
-GATEWAY_CPP_SOURCES = sci_gateway/cpp/gw_csv_helpers.cpp \
-sci_gateway/cpp/sci_csvDefault.cpp \
-sci_gateway/cpp/sci_csvIsnum.cpp \
-sci_gateway/cpp/sci_csvRead.cpp \
-sci_gateway/cpp/sci_csvStringToDouble.cpp \
-sci_gateway/cpp/sci_csvTextScan.cpp \
-sci_gateway/cpp/sci_csvWrite.cpp
-
-libscispreadsheet_la_CPPFLAGS = -I$(srcdir)/includes/ \
-                               -I$(srcdir)/src/c/ \
-                               -I$(srcdir)/src/cpp/ \
-                               -I$(srcdir)/src/c/ripole \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
-                               -I$(top_srcdir)/modules/localization/includes/ \
-                               -I$(top_srcdir)/modules/output_stream/includes/ \
-                               -I$(top_srcdir)/modules/io/includes/ \
-                               -I$(top_srcdir)/modules/string/src/c/ \
-                               -I$(top_srcdir)/modules/string/includes/ \
-                               -I$(top_srcdir)/modules/api_scilab/includes/ \
-                               -I$(top_srcdir)/modules/fileio/includes/ \
-                               $(AM_CPPFLAGS)
+sci_gateway/c/sci_xls_open.c \
+sci_gateway/c/gw_csv_helpers.c \
+sci_gateway/c/sci_csvDefault.c \
+sci_gateway/c/sci_csvIsnum.c \
+sci_gateway/c/sci_csvRead.c \
+sci_gateway/c/sci_csvStringToDouble.c \
+sci_gateway/c/sci_csvTextScan.c \
+sci_gateway/c/sci_csvWrite.c
+
+libscispreadsheet_la_CPPFLAGS = \
+-I$(srcdir)/includes/ \
+-I$(srcdir)/src/c/ \
+-I$(srcdir)/src/c/ripole \
+-I$(top_srcdir)/libs/MALLOC/includes/ \
+-I$(top_srcdir)/modules/localization/includes/ \
+-I$(top_srcdir)/modules/output_stream/includes/ \
+-I$(top_srcdir)/modules/io/includes/ \
+-I$(top_srcdir)/modules/string/src/c/ \
+-I$(top_srcdir)/modules/string/includes/ \
+-I$(top_srcdir)/modules/api_scilab/includes/ \
+-I$(top_srcdir)/modules/fileio/includes/ \
+$(AM_CPPFLAGS)
 
 pkglib_LTLIBRARIES = libscispreadsheet.la
 noinst_LTLIBRARIES = libscispreadsheet-algo.la
-libscispreadsheet_algo_la_SOURCES = $(SPREADSHEET_C_SOURCES) $(RIPOLE_SOURCES) $(SPREADSHEET_CPP_SOURCES)
-libscispreadsheet_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
+libscispreadsheet_algo_la_SOURCES = $(SPREADSHEET_C_SOURCES) $(RIPOLE_SOURCES)
+libscispreadsheet_la_SOURCES = $(GATEWAY_C_SOURCES)
 libscispreadsheet_algo_la_CPPFLAGS = $(libscispreadsheet_la_CPPFLAGS)
 
 # For the code check (splint)
@@ -610,7 +603,7 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .sci .bin .c .cpp .lo .o .obj
+.SUFFIXES: .sci .bin .c .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.incl.am $(am__configure_deps)
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
@@ -684,9 +677,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscispreadsheet-algo.la: $(libscispreadsheet_algo_la_OBJECTS) $(libscispreadsheet_algo_la_DEPENDENCIES) $(EXTRA_libscispreadsheet_algo_la_DEPENDENCIES) 
-       $(CXXLINK)  $(libscispreadsheet_algo_la_OBJECTS) $(libscispreadsheet_algo_la_LIBADD) $(LIBS)
+       $(LINK)  $(libscispreadsheet_algo_la_OBJECTS) $(libscispreadsheet_algo_la_LIBADD) $(LIBS)
 libscispreadsheet.la: $(libscispreadsheet_la_OBJECTS) $(libscispreadsheet_la_DEPENDENCIES) $(EXTRA_libscispreadsheet_la_DEPENDENCIES) 
-       $(CXXLINK) -rpath $(pkglibdir) $(libscispreadsheet_la_OBJECTS) $(libscispreadsheet_la_LIBADD) $(LIBS)
+       $(LINK) -rpath $(pkglibdir) $(libscispreadsheet_la_OBJECTS) $(libscispreadsheet_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
@@ -754,89 +747,96 @@ libscispreadsheet_algo_la-xls.lo: src/c/xls.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-xls.lo `test -f 'src/c/xls.c' || echo '$(srcdir)/'`src/c/xls.c
 
-libscispreadsheet_algo_la-checkCsvWriteFormat.lo: src/cpp/checkCsvWriteFormat.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-checkCsvWriteFormat.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-checkCsvWriteFormat.Tpo -c -o libscispreadsheet_algo_la-checkCsvWriteFormat.lo `test -f 'src/cpp/checkCsvWriteFormat.c' || echo '$(srcdir)/'`src/cpp/checkCsvWriteFormat.c
+libscispreadsheet_algo_la-checkCsvWriteFormat.lo: src/c/checkCsvWriteFormat.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-checkCsvWriteFormat.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-checkCsvWriteFormat.Tpo -c -o libscispreadsheet_algo_la-checkCsvWriteFormat.lo `test -f 'src/c/checkCsvWriteFormat.c' || echo '$(srcdir)/'`src/c/checkCsvWriteFormat.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscispreadsheet_algo_la-checkCsvWriteFormat.Tpo $(DEPDIR)/libscispreadsheet_algo_la-checkCsvWriteFormat.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/cpp/checkCsvWriteFormat.c' object='libscispreadsheet_algo_la-checkCsvWriteFormat.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/checkCsvWriteFormat.c' object='libscispreadsheet_algo_la-checkCsvWriteFormat.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-checkCsvWriteFormat.lo `test -f 'src/cpp/checkCsvWriteFormat.c' || echo '$(srcdir)/'`src/cpp/checkCsvWriteFormat.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-checkCsvWriteFormat.lo `test -f 'src/c/checkCsvWriteFormat.c' || echo '$(srcdir)/'`src/c/checkCsvWriteFormat.c
 
-libscispreadsheet_algo_la-csv_complex.lo: src/cpp/csv_complex.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-csv_complex.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-csv_complex.Tpo -c -o libscispreadsheet_algo_la-csv_complex.lo `test -f 'src/cpp/csv_complex.c' || echo '$(srcdir)/'`src/cpp/csv_complex.c
+libscispreadsheet_algo_la-csv_complex.lo: src/c/csv_complex.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-csv_complex.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-csv_complex.Tpo -c -o libscispreadsheet_algo_la-csv_complex.lo `test -f 'src/c/csv_complex.c' || echo '$(srcdir)/'`src/c/csv_complex.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscispreadsheet_algo_la-csv_complex.Tpo $(DEPDIR)/libscispreadsheet_algo_la-csv_complex.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/cpp/csv_complex.c' object='libscispreadsheet_algo_la-csv_complex.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/csv_complex.c' object='libscispreadsheet_algo_la-csv_complex.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-csv_complex.lo `test -f 'src/cpp/csv_complex.c' || echo '$(srcdir)/'`src/cpp/csv_complex.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-csv_complex.lo `test -f 'src/c/csv_complex.c' || echo '$(srcdir)/'`src/c/csv_complex.c
 
-libscispreadsheet_algo_la-csvDefault.lo: src/cpp/csvDefault.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-csvDefault.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-csvDefault.Tpo -c -o libscispreadsheet_algo_la-csvDefault.lo `test -f 'src/cpp/csvDefault.c' || echo '$(srcdir)/'`src/cpp/csvDefault.c
+libscispreadsheet_algo_la-csvDefault.lo: src/c/csvDefault.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-csvDefault.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-csvDefault.Tpo -c -o libscispreadsheet_algo_la-csvDefault.lo `test -f 'src/c/csvDefault.c' || echo '$(srcdir)/'`src/c/csvDefault.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscispreadsheet_algo_la-csvDefault.Tpo $(DEPDIR)/libscispreadsheet_algo_la-csvDefault.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/cpp/csvDefault.c' object='libscispreadsheet_algo_la-csvDefault.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/csvDefault.c' object='libscispreadsheet_algo_la-csvDefault.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-csvDefault.lo `test -f 'src/cpp/csvDefault.c' || echo '$(srcdir)/'`src/cpp/csvDefault.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-csvDefault.lo `test -f 'src/c/csvDefault.c' || echo '$(srcdir)/'`src/c/csvDefault.c
 
-libscispreadsheet_algo_la-csvIsnum.lo: src/cpp/csvIsnum.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-csvIsnum.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-csvIsnum.Tpo -c -o libscispreadsheet_algo_la-csvIsnum.lo `test -f 'src/cpp/csvIsnum.c' || echo '$(srcdir)/'`src/cpp/csvIsnum.c
+libscispreadsheet_algo_la-csvIsnum.lo: src/c/csvIsnum.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-csvIsnum.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-csvIsnum.Tpo -c -o libscispreadsheet_algo_la-csvIsnum.lo `test -f 'src/c/csvIsnum.c' || echo '$(srcdir)/'`src/c/csvIsnum.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscispreadsheet_algo_la-csvIsnum.Tpo $(DEPDIR)/libscispreadsheet_algo_la-csvIsnum.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/cpp/csvIsnum.c' object='libscispreadsheet_algo_la-csvIsnum.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/csvIsnum.c' object='libscispreadsheet_algo_la-csvIsnum.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-csvIsnum.lo `test -f 'src/cpp/csvIsnum.c' || echo '$(srcdir)/'`src/cpp/csvIsnum.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-csvIsnum.lo `test -f 'src/c/csvIsnum.c' || echo '$(srcdir)/'`src/c/csvIsnum.c
 
-libscispreadsheet_algo_la-csvRead.lo: src/cpp/csvRead.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-csvRead.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-csvRead.Tpo -c -o libscispreadsheet_algo_la-csvRead.lo `test -f 'src/cpp/csvRead.c' || echo '$(srcdir)/'`src/cpp/csvRead.c
+libscispreadsheet_algo_la-csvRead.lo: src/c/csvRead.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-csvRead.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-csvRead.Tpo -c -o libscispreadsheet_algo_la-csvRead.lo `test -f 'src/c/csvRead.c' || echo '$(srcdir)/'`src/c/csvRead.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscispreadsheet_algo_la-csvRead.Tpo $(DEPDIR)/libscispreadsheet_algo_la-csvRead.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/cpp/csvRead.c' object='libscispreadsheet_algo_la-csvRead.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/csvRead.c' object='libscispreadsheet_algo_la-csvRead.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-csvRead.lo `test -f 'src/c/csvRead.c' || echo '$(srcdir)/'`src/c/csvRead.c
+
+libscispreadsheet_algo_la-csv_strsubst.lo: src/c/csv_strsubst.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-csv_strsubst.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-csv_strsubst.Tpo -c -o libscispreadsheet_algo_la-csv_strsubst.lo `test -f 'src/c/csv_strsubst.c' || echo '$(srcdir)/'`src/c/csv_strsubst.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscispreadsheet_algo_la-csv_strsubst.Tpo $(DEPDIR)/libscispreadsheet_algo_la-csv_strsubst.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/csv_strsubst.c' object='libscispreadsheet_algo_la-csv_strsubst.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-csvRead.lo `test -f 'src/cpp/csvRead.c' || echo '$(srcdir)/'`src/cpp/csvRead.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-csv_strsubst.lo `test -f 'src/c/csv_strsubst.c' || echo '$(srcdir)/'`src/c/csv_strsubst.c
 
-libscispreadsheet_algo_la-csvWrite.lo: src/cpp/csvWrite.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-csvWrite.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-csvWrite.Tpo -c -o libscispreadsheet_algo_la-csvWrite.lo `test -f 'src/cpp/csvWrite.c' || echo '$(srcdir)/'`src/cpp/csvWrite.c
+libscispreadsheet_algo_la-csvWrite.lo: src/c/csvWrite.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-csvWrite.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-csvWrite.Tpo -c -o libscispreadsheet_algo_la-csvWrite.lo `test -f 'src/c/csvWrite.c' || echo '$(srcdir)/'`src/c/csvWrite.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscispreadsheet_algo_la-csvWrite.Tpo $(DEPDIR)/libscispreadsheet_algo_la-csvWrite.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/cpp/csvWrite.c' object='libscispreadsheet_algo_la-csvWrite.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/csvWrite.c' object='libscispreadsheet_algo_la-csvWrite.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-csvWrite.lo `test -f 'src/cpp/csvWrite.c' || echo '$(srcdir)/'`src/cpp/csvWrite.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-csvWrite.lo `test -f 'src/c/csvWrite.c' || echo '$(srcdir)/'`src/c/csvWrite.c
 
-libscispreadsheet_algo_la-getRange.lo: src/cpp/getRange.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-getRange.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-getRange.Tpo -c -o libscispreadsheet_algo_la-getRange.lo `test -f 'src/cpp/getRange.c' || echo '$(srcdir)/'`src/cpp/getRange.c
+libscispreadsheet_algo_la-getRange.lo: src/c/getRange.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-getRange.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-getRange.Tpo -c -o libscispreadsheet_algo_la-getRange.lo `test -f 'src/c/getRange.c' || echo '$(srcdir)/'`src/c/getRange.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscispreadsheet_algo_la-getRange.Tpo $(DEPDIR)/libscispreadsheet_algo_la-getRange.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/cpp/getRange.c' object='libscispreadsheet_algo_la-getRange.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/getRange.c' object='libscispreadsheet_algo_la-getRange.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-getRange.lo `test -f 'src/cpp/getRange.c' || echo '$(srcdir)/'`src/cpp/getRange.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-getRange.lo `test -f 'src/c/getRange.c' || echo '$(srcdir)/'`src/c/getRange.c
 
-libscispreadsheet_algo_la-latintoutf.lo: src/cpp/latintoutf.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-latintoutf.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-latintoutf.Tpo -c -o libscispreadsheet_algo_la-latintoutf.lo `test -f 'src/cpp/latintoutf.c' || echo '$(srcdir)/'`src/cpp/latintoutf.c
+libscispreadsheet_algo_la-latintoutf.lo: src/c/latintoutf.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-latintoutf.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-latintoutf.Tpo -c -o libscispreadsheet_algo_la-latintoutf.lo `test -f 'src/c/latintoutf.c' || echo '$(srcdir)/'`src/c/latintoutf.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscispreadsheet_algo_la-latintoutf.Tpo $(DEPDIR)/libscispreadsheet_algo_la-latintoutf.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/cpp/latintoutf.c' object='libscispreadsheet_algo_la-latintoutf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/latintoutf.c' object='libscispreadsheet_algo_la-latintoutf.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-latintoutf.lo `test -f 'src/cpp/latintoutf.c' || echo '$(srcdir)/'`src/cpp/latintoutf.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-latintoutf.lo `test -f 'src/c/latintoutf.c' || echo '$(srcdir)/'`src/c/latintoutf.c
 
-libscispreadsheet_algo_la-splitLine.lo: src/cpp/splitLine.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-splitLine.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-splitLine.Tpo -c -o libscispreadsheet_algo_la-splitLine.lo `test -f 'src/cpp/splitLine.c' || echo '$(srcdir)/'`src/cpp/splitLine.c
+libscispreadsheet_algo_la-splitLine.lo: src/c/splitLine.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-splitLine.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-splitLine.Tpo -c -o libscispreadsheet_algo_la-splitLine.lo `test -f 'src/c/splitLine.c' || echo '$(srcdir)/'`src/c/splitLine.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscispreadsheet_algo_la-splitLine.Tpo $(DEPDIR)/libscispreadsheet_algo_la-splitLine.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/cpp/splitLine.c' object='libscispreadsheet_algo_la-splitLine.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/splitLine.c' object='libscispreadsheet_algo_la-splitLine.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-splitLine.lo `test -f 'src/cpp/splitLine.c' || echo '$(srcdir)/'`src/cpp/splitLine.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-splitLine.lo `test -f 'src/c/splitLine.c' || echo '$(srcdir)/'`src/c/splitLine.c
 
-libscispreadsheet_algo_la-stringsToDoubles.lo: src/cpp/stringsToDoubles.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-stringsToDoubles.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-stringsToDoubles.Tpo -c -o libscispreadsheet_algo_la-stringsToDoubles.lo `test -f 'src/cpp/stringsToDoubles.c' || echo '$(srcdir)/'`src/cpp/stringsToDoubles.c
+libscispreadsheet_algo_la-stringsToDoubles.lo: src/c/stringsToDoubles.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-stringsToDoubles.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-stringsToDoubles.Tpo -c -o libscispreadsheet_algo_la-stringsToDoubles.lo `test -f 'src/c/stringsToDoubles.c' || echo '$(srcdir)/'`src/c/stringsToDoubles.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscispreadsheet_algo_la-stringsToDoubles.Tpo $(DEPDIR)/libscispreadsheet_algo_la-stringsToDoubles.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/cpp/stringsToDoubles.c' object='libscispreadsheet_algo_la-stringsToDoubles.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/stringsToDoubles.c' object='libscispreadsheet_algo_la-stringsToDoubles.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-stringsToDoubles.lo `test -f 'src/cpp/stringsToDoubles.c' || echo '$(srcdir)/'`src/cpp/stringsToDoubles.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-stringsToDoubles.lo `test -f 'src/c/stringsToDoubles.c' || echo '$(srcdir)/'`src/c/stringsToDoubles.c
 
-libscispreadsheet_algo_la-stringToComplex.lo: src/cpp/stringToComplex.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-stringToComplex.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-stringToComplex.Tpo -c -o libscispreadsheet_algo_la-stringToComplex.lo `test -f 'src/cpp/stringToComplex.c' || echo '$(srcdir)/'`src/cpp/stringToComplex.c
+libscispreadsheet_algo_la-stringToComplex.lo: src/c/stringToComplex.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-stringToComplex.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-stringToComplex.Tpo -c -o libscispreadsheet_algo_la-stringToComplex.lo `test -f 'src/c/stringToComplex.c' || echo '$(srcdir)/'`src/c/stringToComplex.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscispreadsheet_algo_la-stringToComplex.Tpo $(DEPDIR)/libscispreadsheet_algo_la-stringToComplex.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/cpp/stringToComplex.c' object='libscispreadsheet_algo_la-stringToComplex.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/stringToComplex.c' object='libscispreadsheet_algo_la-stringToComplex.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-stringToComplex.lo `test -f 'src/cpp/stringToComplex.c' || echo '$(srcdir)/'`src/cpp/stringToComplex.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-stringToComplex.lo `test -f 'src/c/stringToComplex.c' || echo '$(srcdir)/'`src/c/stringToComplex.c
 
-libscispreadsheet_algo_la-utftolatin.lo: src/cpp/utftolatin.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-utftolatin.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-utftolatin.Tpo -c -o libscispreadsheet_algo_la-utftolatin.lo `test -f 'src/cpp/utftolatin.c' || echo '$(srcdir)/'`src/cpp/utftolatin.c
+libscispreadsheet_algo_la-utftolatin.lo: src/c/utftolatin.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-utftolatin.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-utftolatin.Tpo -c -o libscispreadsheet_algo_la-utftolatin.lo `test -f 'src/c/utftolatin.c' || echo '$(srcdir)/'`src/c/utftolatin.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscispreadsheet_algo_la-utftolatin.Tpo $(DEPDIR)/libscispreadsheet_algo_la-utftolatin.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/cpp/utftolatin.c' object='libscispreadsheet_algo_la-utftolatin.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/utftolatin.c' object='libscispreadsheet_algo_la-utftolatin.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-utftolatin.lo `test -f 'src/cpp/utftolatin.c' || echo '$(srcdir)/'`src/cpp/utftolatin.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_algo_la-utftolatin.lo `test -f 'src/c/utftolatin.c' || echo '$(srcdir)/'`src/c/utftolatin.c
 
 libscispreadsheet_algo_la-olestream-unwrap.lo: src/c/ripole/olestream-unwrap.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_algo_la-olestream-unwrap.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-olestream-unwrap.Tpo -c -o libscispreadsheet_algo_la-olestream-unwrap.lo `test -f 'src/c/ripole/olestream-unwrap.c' || echo '$(srcdir)/'`src/c/ripole/olestream-unwrap.c
@@ -908,82 +908,54 @@ libscispreadsheet_la-sci_xls_open.lo: sci_gateway/c/sci_xls_open.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_la-sci_xls_open.lo `test -f 'sci_gateway/c/sci_xls_open.c' || echo '$(srcdir)/'`sci_gateway/c/sci_xls_open.c
 
-.cpp.o:
-@am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@  $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
-libscispreadsheet_algo_la-csv_strsubst.lo: src/cpp/csv_strsubst.cpp
-@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscispreadsheet_algo_la-csv_strsubst.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_algo_la-csv_strsubst.Tpo -c -o libscispreadsheet_algo_la-csv_strsubst.lo `test -f 'src/cpp/csv_strsubst.cpp' || echo '$(srcdir)/'`src/cpp/csv_strsubst.cpp
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscispreadsheet_algo_la-csv_strsubst.Tpo $(DEPDIR)/libscispreadsheet_algo_la-csv_strsubst.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/csv_strsubst.cpp' object='libscispreadsheet_algo_la-csv_strsubst.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscispreadsheet_algo_la-csv_strsubst.lo `test -f 'src/cpp/csv_strsubst.cpp' || echo '$(srcdir)/'`src/cpp/csv_strsubst.cpp
-
-libscispreadsheet_la-gw_csv_helpers.lo: sci_gateway/cpp/gw_csv_helpers.cpp
-@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscispreadsheet_la-gw_csv_helpers.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-gw_csv_helpers.Tpo -c -o libscispreadsheet_la-gw_csv_helpers.lo `test -f 'sci_gateway/cpp/gw_csv_helpers.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/gw_csv_helpers.cpp
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscispreadsheet_la-gw_csv_helpers.Tpo $(DEPDIR)/libscispreadsheet_la-gw_csv_helpers.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/gw_csv_helpers.cpp' object='libscispreadsheet_la-gw_csv_helpers.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscispreadsheet_la-gw_csv_helpers.lo `test -f 'sci_gateway/cpp/gw_csv_helpers.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/gw_csv_helpers.cpp
-
-libscispreadsheet_la-sci_csvDefault.lo: sci_gateway/cpp/sci_csvDefault.cpp
-@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscispreadsheet_la-sci_csvDefault.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-sci_csvDefault.Tpo -c -o libscispreadsheet_la-sci_csvDefault.lo `test -f 'sci_gateway/cpp/sci_csvDefault.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_csvDefault.cpp
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscispreadsheet_la-sci_csvDefault.Tpo $(DEPDIR)/libscispreadsheet_la-sci_csvDefault.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_csvDefault.cpp' object='libscispreadsheet_la-sci_csvDefault.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscispreadsheet_la-sci_csvDefault.lo `test -f 'sci_gateway/cpp/sci_csvDefault.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_csvDefault.cpp
-
-libscispreadsheet_la-sci_csvIsnum.lo: sci_gateway/cpp/sci_csvIsnum.cpp
-@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscispreadsheet_la-sci_csvIsnum.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-sci_csvIsnum.Tpo -c -o libscispreadsheet_la-sci_csvIsnum.lo `test -f 'sci_gateway/cpp/sci_csvIsnum.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_csvIsnum.cpp
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscispreadsheet_la-sci_csvIsnum.Tpo $(DEPDIR)/libscispreadsheet_la-sci_csvIsnum.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_csvIsnum.cpp' object='libscispreadsheet_la-sci_csvIsnum.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscispreadsheet_la-sci_csvIsnum.lo `test -f 'sci_gateway/cpp/sci_csvIsnum.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_csvIsnum.cpp
-
-libscispreadsheet_la-sci_csvRead.lo: sci_gateway/cpp/sci_csvRead.cpp
-@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscispreadsheet_la-sci_csvRead.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-sci_csvRead.Tpo -c -o libscispreadsheet_la-sci_csvRead.lo `test -f 'sci_gateway/cpp/sci_csvRead.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_csvRead.cpp
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscispreadsheet_la-sci_csvRead.Tpo $(DEPDIR)/libscispreadsheet_la-sci_csvRead.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_csvRead.cpp' object='libscispreadsheet_la-sci_csvRead.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscispreadsheet_la-sci_csvRead.lo `test -f 'sci_gateway/cpp/sci_csvRead.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_csvRead.cpp
-
-libscispreadsheet_la-sci_csvStringToDouble.lo: sci_gateway/cpp/sci_csvStringToDouble.cpp
-@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscispreadsheet_la-sci_csvStringToDouble.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-sci_csvStringToDouble.Tpo -c -o libscispreadsheet_la-sci_csvStringToDouble.lo `test -f 'sci_gateway/cpp/sci_csvStringToDouble.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_csvStringToDouble.cpp
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscispreadsheet_la-sci_csvStringToDouble.Tpo $(DEPDIR)/libscispreadsheet_la-sci_csvStringToDouble.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_csvStringToDouble.cpp' object='libscispreadsheet_la-sci_csvStringToDouble.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscispreadsheet_la-sci_csvStringToDouble.lo `test -f 'sci_gateway/cpp/sci_csvStringToDouble.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_csvStringToDouble.cpp
-
-libscispreadsheet_la-sci_csvTextScan.lo: sci_gateway/cpp/sci_csvTextScan.cpp
-@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscispreadsheet_la-sci_csvTextScan.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-sci_csvTextScan.Tpo -c -o libscispreadsheet_la-sci_csvTextScan.lo `test -f 'sci_gateway/cpp/sci_csvTextScan.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_csvTextScan.cpp
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscispreadsheet_la-sci_csvTextScan.Tpo $(DEPDIR)/libscispreadsheet_la-sci_csvTextScan.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_csvTextScan.cpp' object='libscispreadsheet_la-sci_csvTextScan.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscispreadsheet_la-sci_csvTextScan.lo `test -f 'sci_gateway/cpp/sci_csvTextScan.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_csvTextScan.cpp
-
-libscispreadsheet_la-sci_csvWrite.lo: sci_gateway/cpp/sci_csvWrite.cpp
-@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscispreadsheet_la-sci_csvWrite.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-sci_csvWrite.Tpo -c -o libscispreadsheet_la-sci_csvWrite.lo `test -f 'sci_gateway/cpp/sci_csvWrite.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_csvWrite.cpp
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscispreadsheet_la-sci_csvWrite.Tpo $(DEPDIR)/libscispreadsheet_la-sci_csvWrite.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_csvWrite.cpp' object='libscispreadsheet_la-sci_csvWrite.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscispreadsheet_la-sci_csvWrite.lo `test -f 'sci_gateway/cpp/sci_csvWrite.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_csvWrite.cpp
+libscispreadsheet_la-gw_csv_helpers.lo: sci_gateway/c/gw_csv_helpers.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_la-gw_csv_helpers.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-gw_csv_helpers.Tpo -c -o libscispreadsheet_la-gw_csv_helpers.lo `test -f 'sci_gateway/c/gw_csv_helpers.c' || echo '$(srcdir)/'`sci_gateway/c/gw_csv_helpers.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscispreadsheet_la-gw_csv_helpers.Tpo $(DEPDIR)/libscispreadsheet_la-gw_csv_helpers.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/gw_csv_helpers.c' object='libscispreadsheet_la-gw_csv_helpers.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_la-gw_csv_helpers.lo `test -f 'sci_gateway/c/gw_csv_helpers.c' || echo '$(srcdir)/'`sci_gateway/c/gw_csv_helpers.c
+
+libscispreadsheet_la-sci_csvDefault.lo: sci_gateway/c/sci_csvDefault.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_la-sci_csvDefault.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-sci_csvDefault.Tpo -c -o libscispreadsheet_la-sci_csvDefault.lo `test -f 'sci_gateway/c/sci_csvDefault.c' || echo '$(srcdir)/'`sci_gateway/c/sci_csvDefault.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscispreadsheet_la-sci_csvDefault.Tpo $(DEPDIR)/libscispreadsheet_la-sci_csvDefault.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_csvDefault.c' object='libscispreadsheet_la-sci_csvDefault.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_la-sci_csvDefault.lo `test -f 'sci_gateway/c/sci_csvDefault.c' || echo '$(srcdir)/'`sci_gateway/c/sci_csvDefault.c
+
+libscispreadsheet_la-sci_csvIsnum.lo: sci_gateway/c/sci_csvIsnum.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_la-sci_csvIsnum.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-sci_csvIsnum.Tpo -c -o libscispreadsheet_la-sci_csvIsnum.lo `test -f 'sci_gateway/c/sci_csvIsnum.c' || echo '$(srcdir)/'`sci_gateway/c/sci_csvIsnum.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscispreadsheet_la-sci_csvIsnum.Tpo $(DEPDIR)/libscispreadsheet_la-sci_csvIsnum.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_csvIsnum.c' object='libscispreadsheet_la-sci_csvIsnum.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_la-sci_csvIsnum.lo `test -f 'sci_gateway/c/sci_csvIsnum.c' || echo '$(srcdir)/'`sci_gateway/c/sci_csvIsnum.c
+
+libscispreadsheet_la-sci_csvRead.lo: sci_gateway/c/sci_csvRead.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_la-sci_csvRead.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-sci_csvRead.Tpo -c -o libscispreadsheet_la-sci_csvRead.lo `test -f 'sci_gateway/c/sci_csvRead.c' || echo '$(srcdir)/'`sci_gateway/c/sci_csvRead.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscispreadsheet_la-sci_csvRead.Tpo $(DEPDIR)/libscispreadsheet_la-sci_csvRead.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_csvRead.c' object='libscispreadsheet_la-sci_csvRead.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_la-sci_csvRead.lo `test -f 'sci_gateway/c/sci_csvRead.c' || echo '$(srcdir)/'`sci_gateway/c/sci_csvRead.c
+
+libscispreadsheet_la-sci_csvStringToDouble.lo: sci_gateway/c/sci_csvStringToDouble.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_la-sci_csvStringToDouble.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-sci_csvStringToDouble.Tpo -c -o libscispreadsheet_la-sci_csvStringToDouble.lo `test -f 'sci_gateway/c/sci_csvStringToDouble.c' || echo '$(srcdir)/'`sci_gateway/c/sci_csvStringToDouble.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscispreadsheet_la-sci_csvStringToDouble.Tpo $(DEPDIR)/libscispreadsheet_la-sci_csvStringToDouble.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_csvStringToDouble.c' object='libscispreadsheet_la-sci_csvStringToDouble.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_la-sci_csvStringToDouble.lo `test -f 'sci_gateway/c/sci_csvStringToDouble.c' || echo '$(srcdir)/'`sci_gateway/c/sci_csvStringToDouble.c
+
+libscispreadsheet_la-sci_csvTextScan.lo: sci_gateway/c/sci_csvTextScan.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_la-sci_csvTextScan.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-sci_csvTextScan.Tpo -c -o libscispreadsheet_la-sci_csvTextScan.lo `test -f 'sci_gateway/c/sci_csvTextScan.c' || echo '$(srcdir)/'`sci_gateway/c/sci_csvTextScan.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscispreadsheet_la-sci_csvTextScan.Tpo $(DEPDIR)/libscispreadsheet_la-sci_csvTextScan.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_csvTextScan.c' object='libscispreadsheet_la-sci_csvTextScan.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_la-sci_csvTextScan.lo `test -f 'sci_gateway/c/sci_csvTextScan.c' || echo '$(srcdir)/'`sci_gateway/c/sci_csvTextScan.c
+
+libscispreadsheet_la-sci_csvWrite.lo: sci_gateway/c/sci_csvWrite.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscispreadsheet_la-sci_csvWrite.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-sci_csvWrite.Tpo -c -o libscispreadsheet_la-sci_csvWrite.lo `test -f 'sci_gateway/c/sci_csvWrite.c' || echo '$(srcdir)/'`sci_gateway/c/sci_csvWrite.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscispreadsheet_la-sci_csvWrite.Tpo $(DEPDIR)/libscispreadsheet_la-sci_csvWrite.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_csvWrite.c' object='libscispreadsheet_la-sci_csvWrite.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscispreadsheet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_la-sci_csvWrite.lo `test -f 'sci_gateway/c/sci_csvWrite.c' || echo '$(srcdir)/'`sci_gateway/c/sci_csvWrite.c
 
 mostlyclean-libtool:
        -rm -f *.lo
@@ -293,7 +293,10 @@ int csv_isRowVector(void* _pvCtx, int _iVar)
     SciErr sciErr;
     int *piAddressVar = NULL;
     sciErr = getVarAddressFromPosition(pvApiCtx, _iVar, &piAddressVar);
-    if (sciErr.iErr) return 0;
+    if (sciErr.iErr)
+    {
+        return 0;
+    }
     return isRowVector(pvApiCtx, piAddressVar);
 }
 // =============================================================================
@@ -302,7 +305,10 @@ int csv_isColumnVector(void* _pvCtx, int _iVar)
     SciErr sciErr;
     int *piAddressVar = NULL;
     sciErr = getVarAddressFromPosition(pvApiCtx, _iVar, &piAddressVar);
-    if (sciErr.iErr) return 0;
+    if (sciErr.iErr)
+    {
+        return 0;
+    }
     return isColumnVector(pvApiCtx, piAddressVar);
 }
 // =============================================================================
@@ -311,7 +317,10 @@ int csv_isScalar(void* _pvCtx, int _iVar)
     SciErr sciErr;
     int *piAddressVar = NULL;
     sciErr = getVarAddressFromPosition(pvApiCtx, _iVar, &piAddressVar);
-    if (sciErr.iErr) return 0;
+    if (sciErr.iErr)
+    {
+        return 0;
+    }
     return isScalar(pvApiCtx, piAddressVar);
 }
 // =============================================================================
@@ -321,13 +330,19 @@ int csv_isDoubleScalar(void* _pvCtx, int _iVar)
     int *piAddressVar = NULL;
 
     sciErr = getVarAddressFromPosition(pvApiCtx, _iVar, &piAddressVar);
-    if (sciErr.iErr) return 0;
+    if (sciErr.iErr)
+    {
+        return 0;
+    }
 
     if (csv_isScalar(_pvCtx, _iVar))
     {
         int iType = 0;
         sciErr = getVarType(pvApiCtx, piAddressVar, &iType);
-        if (sciErr.iErr) return 0;
+        if (sciErr.iErr)
+        {
+            return 0;
+        }
 
         if (isVarComplex(pvApiCtx, piAddressVar) == 0)
         {
@@ -346,7 +361,10 @@ int csv_isEmpty(void* _pvCtx, int _iVar)
     if (sciErr.iErr)
     {
         printError(&sciErr, 0);
-        if (sciErr.iErr) return 0;
+        if (sciErr.iErr)
+        {
+            return 0;
+        }
     }
 
     return isEmptyMatrix(pvApiCtx, piAddressVar);
  * This code is also published under the GPL v3 license.
  *
  */
+
 #include <string.h>
 #include <stdio.h>
-#include "gw_csv_tools.h"
+#include "gw_spreadsheet.h"
 #include "api_scilab.h"
 #include "Scierror.h"
 #include "MALLOC.h"
 #include "Scierror.h"
 #include "localization.h"
-extern "C" {
 #include "freeArrayOfString.h"
-};
 #ifdef _MSC_VER
 #include "strdup_windows.h"
 #endif
 #include "csvDefault.h"
 #include "gw_csv_helpers.h"
+
+
 // =============================================================================
 #define SEPARATOR_FIELDNAME "separator"
 #define DECIMAL_FIELDNAME "decimal"
@@ -52,7 +53,7 @@ static int sci_csvDefault_no_rhs(char *fname);
 static int sci_csvDefault_one_rhs(char *fname);
 static int sci_csvDefault_two_rhs(char *fname);
 // =============================================================================
-int sci_csvDefault(char *fname)
+int sci_csvDefault(char *fname, unsigned long fname_len)
 {
     Rhs = Max(0, Rhs);
     CheckRhs(0, 2);
@@ -152,7 +153,10 @@ static int sci_csvDefault_one_rhs(char *fname)
     char *fieldvalue = NULL;
 
     fieldname = csv_getArgumentAsString(pvApiCtx, 1, fname, &iErr);
-    if (iErr) return 0;
+    if (iErr)
+    {
+        return 0;
+    }
 
     if (strcmp(fieldname, SEPARATOR_FIELDNAME) == 0)
     {
@@ -271,7 +275,10 @@ static int sci_csvDefault_two_rhs(char *fname)
     int  ifieldvalue = 0;
 
     fieldname = csv_getArgumentAsString(pvApiCtx, 1, fname, &iErr);
-    if (iErr) return 0;
+    if (iErr)
+    {
+        return 0;
+    }
 
     if (strcmp(fieldname, PRECISION_FIELDNAME) == 0)
     {
  * This code is also published under the GPL v3 license.
  *
  */
-#include "gw_csv_tools.h"
+
+#include "gw_spreadsheet.h"
 #include "api_scilab.h"
 #include "localization.h"
 #include "Scierror.h"
 #include "csvIsnum.h"
 #include "MALLOC.h"
+
 // =============================================================================
-int sci_csvIsnum(char *fname)
+int sci_csvIsnum(char *fname, unsigned long fname_len)
 {
     SciErr sciErr;
     int *piAddressVarOne = NULL;
  * This code is also published under the GPL v3 license.
  *
  */
+
 #include <string.h>
 #include <stdio.h>
-
-#include "gw_csv_tools.h"
+#include "gw_spreadsheet.h"
 #include "api_scilab.h"
 #include "Scierror.h"
 #include "localization.h"
-extern "C" {
 #include "freeArrayOfString.h"
-};
 #include "MALLOC.h"
 #include "csvRead.h"
 #ifdef _MSC_VER
@@ -32,13 +30,14 @@ extern "C" {
 #include "csv_complex.h"
 #include "gw_csv_helpers.h"
 #include "getRange.h"
+
 /* ==================================================================== */
 #define CONVTOSTR "string"
 #define CONVTODOUBLE "double"
 /* ==================================================================== */
 /* csvRead(filename, separator, decimal, conversion, substitute, range)*/
 /* ==================================================================== */
-int sci_csvRead(char *fname)
+int sci_csvRead(char *fname, unsigned long fname_len)
 {
     SciErr sciErr;
     int iErr = 0;
@@ -67,7 +66,10 @@ int sci_csvRead(char *fname)
         int m7 = 0, n7 = 0;
 
         iRange = csv_getArgumentAsMatrixofIntFromDouble(pvApiCtx, 7, fname, &m7, &n7, &iErr);
-        if (iErr) return 0;
+        if (iErr)
+        {
+            return 0;
+        }
 
         if ((m7 * n7 != SIZE_RANGE_SUPPORTED) )
         {
@@ -119,7 +121,10 @@ int sci_csvRead(char *fname)
                 regexp = NULL;
             }
         }
-        if (iErr) return 0;
+        if (iErr)
+        {
+            return 0;
+        }
     }
     else
     {
  *
  */
 #include <string.h>
-#include "gw_csv_tools.h"
 #include "api_scilab.h"
 #include "Scierror.h"
 #include "MALLOC.h"
 #include "Scierror.h"
 #include "localization.h"
-extern "C" {
 #include "freeArrayOfString.h"
-};
 #ifdef _MSC_VER
 #include "strdup_windows.h"
 #endif
@@ -29,8 +26,9 @@ extern "C" {
 #include "csvDefault.h"
 #include "gw_csv_helpers.h"
 #include "csv_complex.h"
+
 // =============================================================================
-int sci_csvStringToDouble(char *fname)
+int sci_csvStringToDouble(char *fname, unsigned long fname_len)
 {
     SciErr sciErr;
     int iErr = 0;
@@ -52,11 +50,17 @@ int sci_csvStringToDouble(char *fname)
     else /* Rhs == 2 */
     {
         bConvertToNan = (BOOL)csv_getArgumentAsScalarBoolean(pvApiCtx, 2, fname, &iErr);
-        if (iErr) return 0;
+        if (iErr)
+        {
+            return 0;
+        }
     }
 
     pStringValues = csv_getArgumentAsMatrixOfString(pvApiCtx, 1, fname, &m1, &n1, &iErr);
-    if (iErr) return 0;
+    if (iErr)
+    {
+        return 0;
+    }
 
     ptrCsvComplexArray = stringsToCsvComplexArray((const char**)pStringValues, m1 * n1, getCsvDefaultDecimal(), bConvertToNan, &ierr);
 
  *
  */
 #include <string.h>
-#include "gw_csv_tools.h"
+#include "gw_spreadsheet.h"
 #include "api_scilab.h"
 #include "Scierror.h"
 #include "MALLOC.h"
 #include "Scierror.h"
 #include "localization.h"
-extern "C" {
 #include "freeArrayOfString.h"
-};
 #ifdef _MSC_VER
 #include "strdup_windows.h"
 #endif
@@ -30,11 +28,12 @@ extern "C" {
 #include "csvRead.h"
 #include "getRange.h"
 #include "gw_csv_helpers.h"
+
 // =============================================================================
 #define CONVTOSTR "string"
 #define CONVTODOUBLE "double"
 // =============================================================================
-int sci_csvTextScan(char *fname)
+int sci_csvTextScan(char *fname, unsigned long fname_len)
 {
     SciErr sciErr;
     int iErr = 0;
@@ -67,7 +66,10 @@ int sci_csvTextScan(char *fname)
         int m5 = 0, n5 = 0;
 
         iRange = csv_getArgumentAsMatrixofIntFromDouble(pvApiCtx, 5, fname, &m5, &n5, &iErr);
-        if (iErr) return 0;
+        if (iErr)
+        {
+            return 0;
+        }
 
         if ((m5 * n5 != SIZE_RANGE_SUPPORTED) )
         {
  */
 #include <string.h>
 #include <stdio.h>
-#include "gw_csv_tools.h"
 #include "api_scilab.h"
 #include "Scierror.h"
 #include "MALLOC.h"
 #include "csvWrite.h"
 #include "localization.h"
-extern "C" {
 #include "freeArrayOfString.h"
-};
 #ifdef _MSC_VER
 #include "strdup_windows.h"
 #endif
 #include "csvDefault.h"
 #include "checkCsvWriteFormat.h"
 #include "gw_csv_helpers.h"
+
 // =============================================================================
 // csvWrite(M, filename[, separator, decimal, precision]) */
 // with M string or double (not complex)
 // =============================================================================
-int sci_csvWrite(char *fname)
+int sci_csvWrite(char *fname, unsigned long fname_len)
 {
     SciErr sciErr;
     int iErr = 0;
@@ -70,7 +68,10 @@ int sci_csvWrite(char *fname)
         int m6 = 0;
         int n6 = 0;
         pHeadersLines = csv_getArgumentAsMatrixOfString(pvApiCtx, 6, fname, &m6, &n6, &iErr);
-        if (iErr) return 0;
+        if (iErr)
+        {
+            return 0;
+        }
         isOnlyRowOrCol = ((m6 > 1) && (n6 == 1)) || ((m6 == 1) && (n6 > 1)) || ((m6 == 1) && (n6 == 1));
         if (!isOnlyRowOrCol)
         {
@@ -128,7 +129,10 @@ int sci_csvWrite(char *fname)
         else
         {
             precisionFormat = csv_getArgumentAsStringWithEmptyManagement(pvApiCtx, 5, fname, getCsvDefaultPrecision(), &iErr);
-            if (iErr) return 0;
+            if (iErr)
+            {
+                return 0;
+            }
             if (checkCsvWriteFormat(precisionFormat))
             {
                 Scierror(999, _("%s: Not supported format %s.\n"), fname, precisionFormat);
diff --git a/scilab/modules/spreadsheet/sci_gateway/cpp/gw_csv_tools.h b/scilab/modules/spreadsheet/sci_gateway/cpp/gw_csv_tools.h
deleted file mode 100644 (file)
index 5700643..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2010 - 2012 - INRIA - Allan CORNET
- * Copyright (C) 2011 - INRIA - Michael Baudin
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- * This code is also published under the GPL v3 license.
- *
- */
-#ifndef __GW_CSV_TOOLS_H__
-#define __GW_CSV_TOOLS_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-    int sci_csvDefault(char *fname);
-    int sci_csvIsnum(char *fname);
-    int sci_csvRead(char *fname);
-    int sci_csvStringToDouble(char *fname);
-    int sci_csvTextScan(char *fname);
-    int sci_csvWrite(char *fname);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __GW_CSV_TOOLS_H__ */
-// =============================================================================
-
index 6fa2faa..476db73 100644 (file)
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="sci_gateway\cpp\gw_csv_helpers.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_csvDefault.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_csvIsnum.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_csvRead.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_csvStringToDouble.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_csvTextScan.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_csvWrite.cpp" />
-    <ClCompile Include="src\cpp\checkCsvWriteFormat.c" />
-    <ClCompile Include="src\cpp\csv_complex.c" />
-    <ClCompile Include="src\cpp\csvDefault.c" />
-    <ClCompile Include="src\cpp\csvIsnum.c" />
-    <ClCompile Include="src\cpp\csvRead.c" />
-    <ClCompile Include="src\cpp\csv_strsubst.cpp" />
-    <ClCompile Include="src\cpp\csvWrite.c" />
-    <ClCompile Include="src\cpp\getRange.c" />
-    <ClCompile Include="src\cpp\latintoutf.c" />
-    <ClCompile Include="src\cpp\splitLine.c" />
-    <ClCompile Include="src\cpp\stringsToDoubles.c" />
-    <ClCompile Include="src\cpp\stringToComplex.c" />
-    <ClCompile Include="src\cpp\utftolatin.c" />
-    <ClCompile Include="src\c\ripole\bt-int.c" />
-    <ClCompile Include="src\c\ripole\bytedecoders.c" />
-    <ClCompile Include="src\c\DllmainSpreadsheet.c" />
-    <ClCompile Include="sci_gateway\c\gw_spreadsheet.c" />
-    <ClCompile Include="src\c\ripole\logger.c" />
-    <ClCompile Include="src\c\ripole\ole.c" />
-    <ClCompile Include="src\c\ripole\olestream-unwrap.c" />
-    <ClCompile Include="src\c\ripole\pldstr.c" />
-    <ClCompile Include="src\c\ripole\ripole.c" />
-    <ClCompile Include="sci_gateway\c\sci_xls_open.c" />
-    <ClCompile Include="sci_gateway\c\sci_xls_read.c" />
-    <ClCompile Include="src\c\xls.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="sci_gateway\cpp\gw_csv_helpers.h" />
-    <ClInclude Include="sci_gateway\cpp\gw_csv_tools.h" />
-    <ClInclude Include="src\cpp\checkCsvWriteFormat.h" />
-    <ClInclude Include="src\cpp\csv_complex.h" />
-    <ClInclude Include="src\cpp\csvDefault.h" />
-    <ClInclude Include="src\cpp\csvIsnum.h" />
-    <ClInclude Include="src\cpp\csvRead.h" />
-    <ClInclude Include="src\cpp\csv_strsubst.h" />
-    <ClInclude Include="src\cpp\csvWrite.h" />
-    <ClInclude Include="src\cpp\getRange.h" />
-    <ClInclude Include="src\cpp\latintoutf.h" />
-    <ClInclude Include="src\cpp\splitLine.h" />
-    <ClInclude Include="src\cpp\stringsToDoubles.h" />
-    <ClInclude Include="src\cpp\stringToComplex.h" />
-    <ClInclude Include="src\cpp\utftolatin.h" />
-    <ClInclude Include="src\c\ripole\bt-int.h" />
-    <ClInclude Include="src\c\ripole\bytedecoders.h" />
-    <ClInclude Include="includes\dynlib_spreadsheet.h" />
-    <ClInclude Include="includes\gw_spreadsheet.h" />
-    <ClInclude Include="src\c\ripole\logger.h" />
-    <ClInclude Include="src\c\ripole\ole.h" />
-    <ClInclude Include="src\c\ripole\olestream-unwrap.h" />
-    <ClInclude Include="src\c\ripole\pldstr.h" />
-    <ClInclude Include="src\c\ripole\ripole.h" />
-    <ClInclude Include="src\c\xls.h" />
-  </ItemGroup>
-  <ItemGroup>
     <ResourceCompile Include="src\c\spreadsheet.rc" />
   </ItemGroup>
   <ItemGroup>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="includes\dynlib_spreadsheet.h" />
+    <ClInclude Include="includes\gw_spreadsheet.h" />
+    <ClInclude Include="sci_gateway\c\gw_csv_helpers.h" />
+    <ClInclude Include="src\c\checkCsvWriteFormat.h" />
+    <ClInclude Include="src\c\csvDefault.h" />
+    <ClInclude Include="src\c\csvIsnum.h" />
+    <ClInclude Include="src\c\csvRead.h" />
+    <ClInclude Include="src\c\csvWrite.h" />
+    <ClInclude Include="src\c\csv_complex.h" />
+    <ClInclude Include="src\c\csv_strsubst.h" />
+    <ClInclude Include="src\c\getRange.h" />
+    <ClInclude Include="src\c\latintoutf.h" />
+    <ClInclude Include="src\c\ripole\bt-int.h" />
+    <ClInclude Include="src\c\ripole\bytedecoders.h" />
+    <ClInclude Include="src\c\ripole\logger.h" />
+    <ClInclude Include="src\c\ripole\ole.h" />
+    <ClInclude Include="src\c\ripole\olestream-unwrap.h" />
+    <ClInclude Include="src\c\ripole\pldstr.h" />
+    <ClInclude Include="src\c\ripole\ripole.h" />
+    <ClInclude Include="src\c\splitLine.h" />
+    <ClInclude Include="src\c\stringsToDoubles.h" />
+    <ClInclude Include="src\c\stringToComplex.h" />
+    <ClInclude Include="src\c\utftolatin.h" />
+    <ClInclude Include="src\c\xls.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="sci_gateway\c\gw_csv_helpers.c" />
+    <ClCompile Include="sci_gateway\c\gw_spreadsheet.c" />
+    <ClCompile Include="sci_gateway\c\sci_csvDefault.c" />
+    <ClCompile Include="sci_gateway\c\sci_csvIsnum.c" />
+    <ClCompile Include="sci_gateway\c\sci_csvRead.c" />
+    <ClCompile Include="sci_gateway\c\sci_csvStringToDouble.c" />
+    <ClCompile Include="sci_gateway\c\sci_csvTextScan.c" />
+    <ClCompile Include="sci_gateway\c\sci_csvWrite.c" />
+    <ClCompile Include="sci_gateway\c\sci_xls_open.c" />
+    <ClCompile Include="sci_gateway\c\sci_xls_read.c" />
+    <ClCompile Include="src\c\checkCsvWriteFormat.c" />
+    <ClCompile Include="src\c\csvDefault.c" />
+    <ClCompile Include="src\c\csvIsnum.c" />
+    <ClCompile Include="src\c\csvRead.c" />
+    <ClCompile Include="src\c\csvWrite.c" />
+    <ClCompile Include="src\c\csv_complex.c" />
+    <ClCompile Include="src\c\csv_strsubst.c" />
+    <ClCompile Include="src\c\DllmainSpreadsheet.c" />
+    <ClCompile Include="src\c\getRange.c" />
+    <ClCompile Include="src\c\latintoutf.c" />
+    <ClCompile Include="src\c\ripole\bt-int.c" />
+    <ClCompile Include="src\c\ripole\bytedecoders.c" />
+    <ClCompile Include="src\c\ripole\logger.c" />
+    <ClCompile Include="src\c\ripole\ole.c" />
+    <ClCompile Include="src\c\ripole\olestream-unwrap.c" />
+    <ClCompile Include="src\c\ripole\pldstr.c" />
+    <ClCompile Include="src\c\ripole\ripole.c" />
+    <ClCompile Include="src\c\splitLine.c" />
+    <ClCompile Include="src\c\stringsToDoubles.c" />
+    <ClCompile Include="src\c\stringToComplex.c" />
+    <ClCompile Include="src\c\utftolatin.c" />
+    <ClCompile Include="src\c\xls.c" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
index c63bf5d..7642ab3 100644 (file)
     <Filter Include="Libraries Dependencies\Imports">
       <UniqueIdentifier>{797cad15-667e-45f1-93a8-a1d93f52adbc}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\ripole">
+      <UniqueIdentifier>{a9229e67-395b-400e-b702-4a6b69e2440b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ripole">
+      <UniqueIdentifier>{2af5f1e8-4cbe-4e42-a17d-4810d04ee086}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\c\ripole\bt-int.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\c\ripole\bytedecoders.c">
+    <ResourceCompile Include="src\c\spreadsheet.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="core_import.def">
+      <Filter>Libraries Dependencies\Imports</Filter>
+    </None>
+    <None Include="Makefile.am" />
+    <None Include="spreadsheet.iss" />
+    <None Include="sci_gateway\spreadsheet_gateway.xml" />
+    <None Include="locales\spreadsheet.pot">
+      <Filter>localization</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="includes\dynlib_spreadsheet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="includes\gw_spreadsheet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="sci_gateway\c\gw_csv_helpers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\c\checkCsvWriteFormat.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\c\csv_complex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\c\csv_strsubst.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\c\csvDefault.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\c\csvIsnum.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\c\csvRead.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\c\csvWrite.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\c\getRange.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\c\latintoutf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\c\splitLine.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\c\stringsToDoubles.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\c\stringToComplex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\c\utftolatin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\c\xls.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\c\ripole\bt-int.h">
+      <Filter>Header Files\ripole</Filter>
+    </ClInclude>
+    <ClInclude Include="src\c\ripole\bytedecoders.h">
+      <Filter>Header Files\ripole</Filter>
+    </ClInclude>
+    <ClInclude Include="src\c\ripole\logger.h">
+      <Filter>Header Files\ripole</Filter>
+    </ClInclude>
+    <ClInclude Include="src\c\ripole\ole.h">
+      <Filter>Header Files\ripole</Filter>
+    </ClInclude>
+    <ClInclude Include="src\c\ripole\olestream-unwrap.h">
+      <Filter>Header Files\ripole</Filter>
+    </ClInclude>
+    <ClInclude Include="src\c\ripole\pldstr.h">
+      <Filter>Header Files\ripole</Filter>
+    </ClInclude>
+    <ClInclude Include="src\c\ripole\ripole.h">
+      <Filter>Header Files\ripole</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="sci_gateway\c\gw_csv_helpers.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\c\DllmainSpreadsheet.c">
+    <ClCompile Include="sci_gateway\c\gw_spreadsheet.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\c\gw_spreadsheet.c">
+    <ClCompile Include="sci_gateway\c\sci_csvDefault.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\c\ripole\logger.c">
+    <ClCompile Include="sci_gateway\c\sci_csvIsnum.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\c\ripole\ole.c">
+    <ClCompile Include="sci_gateway\c\sci_csvRead.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\c\ripole\olestream-unwrap.c">
+    <ClCompile Include="sci_gateway\c\sci_csvStringToDouble.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\c\ripole\pldstr.c">
+    <ClCompile Include="sci_gateway\c\sci_csvTextScan.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\c\ripole\ripole.c">
+    <ClCompile Include="sci_gateway\c\sci_csvWrite.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="sci_gateway\c\sci_xls_open.c">
     <ClCompile Include="sci_gateway\c\sci_xls_read.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\c\xls.c">
+    <ClCompile Include="src\c\checkCsvWriteFormat.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\gw_csv_helpers.cpp">
+    <ClCompile Include="src\c\csv_complex.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_csvDefault.cpp">
+    <ClCompile Include="src\c\csv_strsubst.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_csvIsnum.cpp">
+    <ClCompile Include="src\c\csvDefault.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_csvRead.cpp">
+    <ClCompile Include="src\c\csvIsnum.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_csvStringToDouble.cpp">
+    <ClCompile Include="src\c\csvRead.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_csvTextScan.cpp">
+    <ClCompile Include="src\c\csvWrite.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_csvWrite.cpp">
+    <ClCompile Include="src\c\DllmainSpreadsheet.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\checkCsvWriteFormat.c">
+    <ClCompile Include="src\c\getRange.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\csv_complex.c">
+    <ClCompile Include="src\c\latintoutf.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\csvDefault.c">
+    <ClCompile Include="src\c\splitLine.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\csvIsnum.c">
+    <ClCompile Include="src\c\stringsToDoubles.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\csvRead.c">
+    <ClCompile Include="src\c\stringToComplex.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\csvWrite.c">
+    <ClCompile Include="src\c\utftolatin.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\getRange.c">
+    <ClCompile Include="src\c\xls.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\latintoutf.c">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="src\c\ripole\bt-int.c">
+      <Filter>Source Files\ripole</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\splitLine.c">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="src\c\ripole\bytedecoders.c">
+      <Filter>Source Files\ripole</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\stringsToDoubles.c">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="src\c\ripole\logger.c">
+      <Filter>Source Files\ripole</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\stringToComplex.c">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="src\c\ripole\ole.c">
+      <Filter>Source Files\ripole</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\utftolatin.c">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="src\c\ripole\olestream-unwrap.c">
+      <Filter>Source Files\ripole</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\csv_strsubst.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="src\c\ripole\pldstr.c">
+      <Filter>Source Files\ripole</Filter>
+    </ClCompile>
+    <ClCompile Include="src\c\ripole\ripole.c">
+      <Filter>Source Files\ripole</Filter>
     </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\c\ripole\bt-int.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\c\ripole\bytedecoders.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="includes\dynlib_spreadsheet.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="includes\gw_spreadsheet.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\c\ripole\logger.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\c\ripole\ole.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\c\ripole\olestream-unwrap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\c\ripole\pldstr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\c\ripole\ripole.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\c\xls.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="sci_gateway\cpp\gw_csv_helpers.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="sci_gateway\cpp\gw_csv_tools.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\checkCsvWriteFormat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\csv_complex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\csvDefault.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\csvIsnum.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\csvRead.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\csv_strsubst.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\csvWrite.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\getRange.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\latintoutf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\splitLine.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\stringsToDoubles.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\stringToComplex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\utftolatin.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="src\c\spreadsheet.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="core_import.def">
-      <Filter>Libraries Dependencies\Imports</Filter>
-    </None>
-    <None Include="Makefile.am" />
-    <None Include="spreadsheet.iss" />
-    <None Include="sci_gateway\spreadsheet_gateway.xml" />
-    <None Include="locales\spreadsheet.pot">
-      <Filter>localization</Filter>
-    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
@@ -99,31 +99,61 @@ const char *getCsvDefaultCsvIgnoreBlankLine(void)
 // =============================================================================
 int setCsvDefaultSeparator(const char *separator)
 {
-    if (initializeCsvDefaultValues()) return 1;
-    if (separator == NULL) return 1;
+    if (initializeCsvDefaultValues())
+    {
+        return 1;
+    }
+    if (separator == NULL)
+    {
+        return 1;
+    }
 
-    if (strcmp(separator, getCsvDefaultDecimal()) == 0) return 1;
+    if (strcmp(separator, getCsvDefaultDecimal()) == 0)
+    {
+        return 1;
+    }
 
-    if (defaultCsvSeparator) FREE(defaultCsvSeparator);
+    if (defaultCsvSeparator)
+    {
+        FREE(defaultCsvSeparator);
+    }
     defaultCsvSeparator = strdup(separator);
-    if (defaultCsvSeparator == NULL) return 1;
+    if (defaultCsvSeparator == NULL)
+    {
+        return 1;
+    }
 
     return 0;
 }
 // =============================================================================
 int setCsvDefaultDecimal(const char *decimal)
 {
-    if (initializeCsvDefaultValues()) return 1;
-    if (decimal == NULL) return 1;
+    if (initializeCsvDefaultValues())
+    {
+        return 1;
+    }
+    if (decimal == NULL)
+    {
+        return 1;
+    }
 
     /* decimal separator supported . and , */
     if ((strcmp(decimal, CSV_DECIMAL_MODE_1) == 0) ||
             (strcmp(decimal, CSV_DECIMAL_MODE_2) == 0))
     {
-        if (strcmp(decimal, getCsvDefaultSeparator()) == 0) return 1;
-        if (defaultCsvDecimal) FREE(defaultCsvDecimal);
+        if (strcmp(decimal, getCsvDefaultSeparator()) == 0)
+        {
+            return 1;
+        }
+        if (defaultCsvDecimal)
+        {
+            FREE(defaultCsvDecimal);
+        }
         defaultCsvDecimal = strdup(decimal);
-        if (defaultCsvDecimal == NULL) return 1;
+        if (defaultCsvDecimal == NULL)
+        {
+            return 1;
+        }
         return 0;
     }
     return 1;
@@ -131,15 +161,27 @@ int setCsvDefaultDecimal(const char *decimal)
 // =============================================================================
 int setCsvDefaultConversion(const char *conversion)
 {
-    if (initializeCsvDefaultValues()) return 1;
-    if (conversion == NULL) return 1;
+    if (initializeCsvDefaultValues())
+    {
+        return 1;
+    }
+    if (conversion == NULL)
+    {
+        return 1;
+    }
 
     if ((strcmp(conversion, CSV_CONVERSION_MODE_1) == 0) ||
             (strcmp(conversion, CSV_CONVERSION_MODE_2) == 0))
     {
-        if (defaultCsvConversion) FREE(defaultCsvConversion);
+        if (defaultCsvConversion)
+        {
+            FREE(defaultCsvConversion);
+        }
         defaultCsvConversion = strdup(conversion);
-        if (defaultCsvConversion) return 0;
+        if (defaultCsvConversion)
+        {
+            return 0;
+        }
     }
 
     return 1;
@@ -147,27 +189,51 @@ int setCsvDefaultConversion(const char *conversion)
 // =============================================================================
 int setCsvDefaultPrecision(const char *precision)
 {
-    if (initializeCsvDefaultValues()) return 1;
-    if (precision == NULL) return 1;
+    if (initializeCsvDefaultValues())
+    {
+        return 1;
+    }
+    if (precision == NULL)
+    {
+        return 1;
+    }
     if (checkCsvWriteFormat(precision) == 0)
     {
-        if (defaultCsvPrecision) FREE(defaultCsvPrecision);
+        if (defaultCsvPrecision)
+        {
+            FREE(defaultCsvPrecision);
+        }
         defaultCsvPrecision = strdup(precision);
-        if (defaultCsvPrecision) return 0;
+        if (defaultCsvPrecision)
+        {
+            return 0;
+        }
     }
     return 1;
 }
 // =============================================================================
 int setCsvDefaultCsvIgnoreBlankLine(const char *blankMode)
 {
-    if (initializeCsvDefaultValues()) return 1;
-    if (blankMode == NULL) return 1;
+    if (initializeCsvDefaultValues())
+    {
+        return 1;
+    }
+    if (blankMode == NULL)
+    {
+        return 1;
+    }
     if ((strcmp(blankMode, CSV_IGNORE_BLANK_LINE_MODE_1) == 0) ||
             (strcmp(blankMode, CSV_IGNORE_BLANK_LINE_MODE_2) == 0))
     {
-        if (defaultCsvIgnoreBlankLine) FREE(defaultCsvIgnoreBlankLine);
+        if (defaultCsvIgnoreBlankLine)
+        {
+            FREE(defaultCsvIgnoreBlankLine);
+        }
         defaultCsvIgnoreBlankLine = strdup(blankMode);
-        if (defaultCsvIgnoreBlankLine) return 0;
+        if (defaultCsvIgnoreBlankLine)
+        {
+            return 0;
+        }
     }
     return 1;
 }
@@ -276,10 +342,19 @@ int setCsvDefaultReset(void)
 // =============================================================================
 int setCsvDefaultCommentsRegExp(const char *commentsRegExp)
 {
-    if (initializeCsvDefaultValues()) return 1;
-    if (commentsRegExp == NULL) return 1;
+    if (initializeCsvDefaultValues())
+    {
+        return 1;
+    }
+    if (commentsRegExp == NULL)
+    {
+        return 1;
+    }
 
-    if (strcmp(commentsRegExp, getCsvDefaultCommentsRegExp()) == 0) return 1;
+    if (strcmp(commentsRegExp, getCsvDefaultCommentsRegExp()) == 0)
+    {
+        return 1;
+    }
 
     if (defaultCsvCommentsRegExp)
     {
@@ -289,17 +364,29 @@ int setCsvDefaultCommentsRegExp(const char *commentsRegExp)
 
     defaultCsvCommentsRegExp = strdup(commentsRegExp);
 
-    if (defaultCsvDecimal == NULL) return 1;
+    if (defaultCsvDecimal == NULL)
+    {
+        return 1;
+    }
 
     return 0;
 }
 // =============================================================================
 int setCsvDefaultEOL(const char *eol)
 {
-    if (initializeCsvDefaultValues()) return 1;
-    if (eol == NULL) return 1;
+    if (initializeCsvDefaultValues())
+    {
+        return 1;
+    }
+    if (eol == NULL)
+    {
+        return 1;
+    }
 
-    if (strcmp(eol, getCsvDefaultEOL()) == 0) return 0;
+    if (strcmp(eol, getCsvDefaultEOL()) == 0)
+    {
+        return 0;
+    }
 
     if (defaultCsvEOL)
     {
@@ -309,17 +396,29 @@ int setCsvDefaultEOL(const char *eol)
 
     defaultCsvEOL = strdup(eol);
 
-    if (defaultCsvEOL == NULL) return 1;
+    if (defaultCsvEOL == NULL)
+    {
+        return 1;
+    }
 
     return 0;
 }
 // =============================================================================
 int setCsvDefaultEncoding(const char *encoding)
 {
-    if (initializeCsvDefaultValues()) return 1;
-    if (encoding == NULL) return 1;
+    if (initializeCsvDefaultValues())
+    {
+        return 1;
+    }
+    if (encoding == NULL)
+    {
+        return 1;
+    }
 
-    if (strcmp(encoding, getCsvDefaultEncoding()) == 0) return 1;
+    if (strcmp(encoding, getCsvDefaultEncoding()) == 0)
+    {
+        return 1;
+    }
 
     if ((strcmp(encoding, DEFAULT_CSV_ENCODING_MODE1) != 0) &&
             (strcmp(encoding, DEFAULT_CSV_ENCODING_MODE2) != 0))
@@ -335,7 +434,10 @@ int setCsvDefaultEncoding(const char *encoding)
 
     defaultCsvEncoding = strdup(encoding);
 
-    if (defaultCsvEncoding == NULL) return 1;
+    if (defaultCsvEncoding == NULL)
+    {
+        return 1;
+    }
 
     return 0;
 }
similarity index 86%
rename from scilab/modules/spreadsheet/src/cpp/csvWrite.c
rename to scilab/modules/spreadsheet/src/c/csvWrite.c
index 5ba5d49..f11486a 100644 (file)
@@ -85,14 +85,35 @@ csvWriteError csvWrite_double(const char *filename,
     char *expandedFilename = NULL;
     int isIsoLatin = 0;
 
-    if (filename == NULL) return CSV_WRITE_ERROR;
-    if (pdValues == NULL) return CSV_WRITE_ERROR;
-    if (m < 0 || n < 0) return CSV_WRITE_ERROR;
-    if (separator == NULL) return CSV_WRITE_ERROR;
-    if (decimal == NULL) return CSV_WRITE_ERROR;
-    if (precisionFormat == NULL) return CSV_WRITE_ERROR;
+    if (filename == NULL)
+    {
+        return CSV_WRITE_ERROR;
+    }
+    if (pdValues == NULL)
+    {
+        return CSV_WRITE_ERROR;
+    }
+    if (m < 0 || n < 0)
+    {
+        return CSV_WRITE_ERROR;
+    }
+    if (separator == NULL)
+    {
+        return CSV_WRITE_ERROR;
+    }
+    if (decimal == NULL)
+    {
+        return CSV_WRITE_ERROR;
+    }
+    if (precisionFormat == NULL)
+    {
+        return CSV_WRITE_ERROR;
+    }
 
-    if (strcmp(separator, decimal) == 0) return CSV_WRITE_SEPARATOR_DECIMAL_EQUAL;
+    if (strcmp(separator, decimal) == 0)
+    {
+        return CSV_WRITE_SEPARATOR_DECIMAL_EQUAL;
+    }
 
     expandedFilename = expandPathVariable((char*)filename);
     wcfopen(fd , filename, MODEWFD);
@@ -101,7 +122,10 @@ csvWriteError csvWrite_double(const char *filename,
         FREE(expandedFilename);
         expandedFilename = NULL;
     }
-    if ( fd == (FILE *)NULL ) return CSV_WRITE_FOPEN_ERROR;
+    if ( fd == (FILE *)NULL )
+    {
+        return CSV_WRITE_FOPEN_ERROR;
+    }
 
     isIsoLatin = doConvertToLatin();
 
@@ -166,7 +190,10 @@ csvWriteError csvWrite_double(const char *filename,
                     fprintf(fd, DEFAULT_CSV_WRITE_STRING_FORMAT, InfString);
                 }
             }
-            if (j + 1 < n) fprintf(fd, "%s", separator);
+            if (j + 1 < n)
+            {
+                fprintf(fd, "%s", separator);
+            }
         }
         fprintf(fd, "%s", getCsvDefaultEOL());
     }
@@ -190,15 +217,39 @@ csvWriteError csvWrite_complex(const char *filename,
     char *expandedFilename = NULL;
     int isIsoLatin = 0;
 
-    if (filename == NULL) return CSV_WRITE_ERROR;
-    if (pdValuesReal == NULL) return CSV_WRITE_ERROR;
-    if (pdValuesImag == NULL) return CSV_WRITE_ERROR;
-    if (m < 0 || n < 0) return CSV_WRITE_ERROR;
-    if (separator == NULL) return CSV_WRITE_ERROR;
-    if (decimal == NULL) return CSV_WRITE_ERROR;
-    if (precisionFormat == NULL) return CSV_WRITE_ERROR;
+    if (filename == NULL)
+    {
+        return CSV_WRITE_ERROR;
+    }
+    if (pdValuesReal == NULL)
+    {
+        return CSV_WRITE_ERROR;
+    }
+    if (pdValuesImag == NULL)
+    {
+        return CSV_WRITE_ERROR;
+    }
+    if (m < 0 || n < 0)
+    {
+        return CSV_WRITE_ERROR;
+    }
+    if (separator == NULL)
+    {
+        return CSV_WRITE_ERROR;
+    }
+    if (decimal == NULL)
+    {
+        return CSV_WRITE_ERROR;
+    }
+    if (precisionFormat == NULL)
+    {
+        return CSV_WRITE_ERROR;
+    }
 
-    if (strcmp(separator, decimal) == 0) return CSV_WRITE_SEPARATOR_DECIMAL_EQUAL;
+    if (strcmp(separator, decimal) == 0)
+    {
+        return CSV_WRITE_SEPARATOR_DECIMAL_EQUAL;
+    }
 
     expandedFilename = expandPathVariable((char*)filename);
     wcfopen(fd , filename, MODEWFD);
@@ -207,7 +258,10 @@ csvWriteError csvWrite_complex(const char *filename,
         FREE(expandedFilename);
         expandedFilename = NULL;
     }
-    if ( fd == (FILE *)NULL ) return CSV_WRITE_FOPEN_ERROR;
+    if ( fd == (FILE *)NULL )
+    {
+        return CSV_WRITE_FOPEN_ERROR;
+    }
 
     isIsoLatin = doConvertToLatin();
 
@@ -329,7 +383,10 @@ csvWriteError csvWrite_complex(const char *filename,
                 strcat(StringValue, ComplexStr);
             }
             fprintf(fd, DEFAULT_CSV_WRITE_STRING_FORMAT, StringValue);
-            if (j + 1 < n) fprintf(fd, "%s", separator);
+            if (j + 1 < n)
+            {
+                fprintf(fd, "%s", separator);
+            }
         }
         fprintf(fd, "%s", getCsvDefaultEOL());
     }
@@ -350,12 +407,27 @@ csvWriteError csvWrite_string(const char *filename,
     char *expandedFilename = NULL;
     int isIsoLatin = 0;
 
-    if (filename == NULL) return CSV_WRITE_ERROR;
-    if (pStrValues == NULL) return CSV_WRITE_ERROR;
-    if (m < 0 || n < 0) return CSV_WRITE_ERROR;
-    if (separator == NULL) return CSV_WRITE_ERROR;
+    if (filename == NULL)
+    {
+        return CSV_WRITE_ERROR;
+    }
+    if (pStrValues == NULL)
+    {
+        return CSV_WRITE_ERROR;
+    }
+    if (m < 0 || n < 0)
+    {
+        return CSV_WRITE_ERROR;
+    }
+    if (separator == NULL)
+    {
+        return CSV_WRITE_ERROR;
+    }
 
-    if (strcmp(separator, decimal) == 0) return CSV_WRITE_SEPARATOR_DECIMAL_EQUAL;
+    if (strcmp(separator, decimal) == 0)
+    {
+        return CSV_WRITE_SEPARATOR_DECIMAL_EQUAL;
+    }
 
     expandedFilename = expandPathVariable((char*)filename);
     wcfopen(fd , filename, MODEWFD);
@@ -364,7 +436,10 @@ csvWriteError csvWrite_string(const char *filename,
         FREE(expandedFilename);
         expandedFilename = NULL;
     }
-    if ( fd == (FILE *)NULL ) return CSV_WRITE_FOPEN_ERROR;
+    if ( fd == (FILE *)NULL )
+    {
+        return CSV_WRITE_FOPEN_ERROR;
+    }
 
     isIsoLatin = doConvertToLatin();
 
@@ -451,7 +526,10 @@ csvWriteError csvWrite_string(const char *filename,
                     fprintf(fd, DEFAULT_CSV_WRITE_STRING_FORMAT, pStrValues[i + m * j]);
                 }
             }
-            if (j + 1 < n) fprintf(fd, "%s", separator);
+            if (j + 1 < n)
+            {
+                fprintf(fd, "%s", separator);
+            }
         }
         fprintf(fd, "%s", getCsvDefaultEOL());
     }
@@ -11,7 +11,7 @@
  */
 #include <string.h>
 #ifndef _MSC_VER
-#include <cstddef>
+#include <stddef.h>
 #endif
 #include "csv_strsubst.h"
 #include "MALLOC.h"
@@ -27,9 +27,18 @@ char *csv_strsubst(const char *input_string, const char *string_to_search, const
     size_t string_to_searchlen = 0;
     size_t count = 0, resultlen = 0, replacement_stringlen = 0;
 
-    if (input_string == NULL) return NULL;
-    if (string_to_search == NULL) return strdup(input_string);
-    if (replacement_string == NULL) return strdup(input_string);
+    if (input_string == NULL)
+    {
+        return NULL;
+    }
+    if (string_to_search == NULL)
+    {
+        return strdup(input_string);
+    }
+    if (replacement_string == NULL)
+    {
+        return strdup(input_string);
+    }
 
     string_to_searchlen = strlen(string_to_search);
     replacement_stringlen = strlen(replacement_string);
@@ -47,7 +56,10 @@ char *csv_strsubst(const char *input_string, const char *string_to_search, const
         resultlen = strlen(input_string);
     }
 
-    if (resultlen + 1 > 0) result = (char*)CALLOC(resultlen + 1, sizeof(char));
+    if (resultlen + 1 > 0)
+    {
+        result = (char*)CALLOC(resultlen + 1, sizeof(char));
+    }
     if (result)
     {
         for (r = result, p = input_string; (q = strstr(p, string_to_search)) != NULL; p = q + string_to_searchlen)
@@ -85,7 +85,10 @@ char *latintoutf(char *_inString)
             int i = 0;
 
             outString = (char*)MALLOC(((len * 3) + 1) * sizeof(char));
-            if (outString == NULL) return NULL;
+            if (outString == NULL)
+            {
+                return NULL;
+            }
             strcpy(outString, EMPTYSTR);
 
             for (i = 0; i < len; i++)
@@ -93,8 +96,14 @@ char *latintoutf(char *_inString)
                 unsigned char *outUtfChar = NULL;
                 unsigned char inAnsiChar = 0;
 
-                if (_inString[i] < 0) inAnsiChar = 256 + _inString[i];
-                else inAnsiChar = _inString[i];
+                if (_inString[i] < 0)
+                {
+                    inAnsiChar = 256 + _inString[i];
+                }
+                else
+                {
+                    inAnsiChar = _inString[i];
+                }
 
                 if (inAnsiChar < 128)
                 {
@@ -20,7 +20,10 @@ double *stringsToDoubles(const char **pSTRs, int nbElements,
     double *dValues = NULL;
 
     *ierr = STRINGTODOUBLE_ERROR;
-    if (nbElements <= 0) return NULL;
+    if (nbElements <= 0)
+    {
+        return NULL;
+    }
 
     if (pSTRs == NULL)
     {
index 8625890..66abe7c 100644 (file)
@@ -11,6 +11,7 @@
 // <-- Short Description -->
 // csvRead, csvTextScan cannot ignore blank lines.
 // =============================================================================
+warning("off");
 txt = ["my data 1";"";"my data 2"];
 ref_res = ["my data 1";"my data 2"];
 assert_checkequal(csvDefault('blank'), 'off');
index 9de9f4d..6038d2b 100644 (file)
@@ -11,6 +11,8 @@
 // <-- Short Description -->
 // csvRead, csvTextScan cannot ignore blank lines.
 // =============================================================================
+
+warning("off");
 txt = ["my data 1";"";"my data 2"];
 ref_res = ["my data 1";"my data 2"];