summaryrefslogtreecommitdiffstats
path: root/scilab/modules/data_structures
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-02 16:50:46 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-02 16:50:46 +0100
commit4543a005198ee3197c08e553378430c9bc590911 (patch)
treef48aacd7ed42e1a1b0f13d95fa7185fe4b6afde7 /scilab/modules/data_structures
parent7262c7b88b413c8a0b09bb0a627d613cdca3f845 (diff)
parent97de4eee52d09735f550d4c632fba106d0cc1762 (diff)
downloadscilab-4543a005198ee3197c08e553378430c9bc590911.zip
scilab-4543a005198ee3197c08e553378430c9bc590911.tar.gz
Merge remote branch 'origin/master' into textrendering
Conflicts: scilab/configure
Diffstat (limited to 'scilab/modules/data_structures')
-rw-r--r--scilab/modules/data_structures/Makefile.in4
-rw-r--r--scilab/modules/data_structures/macros/struct.sci10
-rw-r--r--scilab/modules/data_structures/src/c/data_structures.vcproj4
-rw-r--r--scilab/modules/data_structures/src/fortran/data_structures_f.vfproj4
4 files changed, 16 insertions, 6 deletions
diff --git a/scilab/modules/data_structures/Makefile.in b/scilab/modules/data_structures/Makefile.in
index 7f18f68..2e65fef 100644
--- a/scilab/modules/data_structures/Makefile.in
+++ b/scilab/modules/data_structures/Makefile.in
@@ -194,6 +194,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
194AWK = @AWK@ 194AWK = @AWK@
195BATIK = @BATIK@ 195BATIK = @BATIK@
196BLAS_LIBS = @BLAS_LIBS@ 196BLAS_LIBS = @BLAS_LIBS@
197BSH = @BSH@
197CC = @CC@ 198CC = @CC@
198CCDEPMODE = @CCDEPMODE@ 199CCDEPMODE = @CCDEPMODE@
199CFLAGS = @CFLAGS@ 200CFLAGS = @CFLAGS@
@@ -267,6 +268,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
267JOGL = @JOGL@ 268JOGL = @JOGL@
268JROSETTA_API = @JROSETTA_API@ 269JROSETTA_API = @JROSETTA_API@
269JROSETTA_ENGINE = @JROSETTA_ENGINE@ 270JROSETTA_ENGINE = @JROSETTA_ENGINE@
271JUNIT = @JUNIT@
270LAPACK_LIBS = @LAPACK_LIBS@ 272LAPACK_LIBS = @LAPACK_LIBS@
271LD = @LD@ 273LD = @LD@
272LDFLAGS = @LDFLAGS@ 274LDFLAGS = @LDFLAGS@
@@ -323,6 +325,7 @@ PVM_ENABLE = @PVM_ENABLE@
323PVM_INCLUDE = @PVM_INCLUDE@ 325PVM_INCLUDE = @PVM_INCLUDE@
324PVM_LIB = @PVM_LIB@ 326PVM_LIB = @PVM_LIB@
325PYTHON = @PYTHON@ 327PYTHON = @PYTHON@
328QDOX = @QDOX@
326RANLIB = @RANLIB@ 329RANLIB = @RANLIB@
327RELOCATABLE = @RELOCATABLE@ 330RELOCATABLE = @RELOCATABLE@
328RT_LIB = @RT_LIB@ 331RT_LIB = @RT_LIB@
@@ -341,6 +344,7 @@ SWIG_JAVA = @SWIG_JAVA@
341SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 344SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
342TCLTK_LIBS = @TCLTK_LIBS@ 345TCLTK_LIBS = @TCLTK_LIBS@
343TCL_INC_PATH = @TCL_INC_PATH@ 346TCL_INC_PATH = @TCL_INC_PATH@
347TESTNG = @TESTNG@
344TK_INC_PATH = @TK_INC_PATH@ 348TK_INC_PATH = @TK_INC_PATH@
345UMFPACK_ENABLE = @UMFPACK_ENABLE@ 349UMFPACK_ENABLE = @UMFPACK_ENABLE@
346UMFPACK_LIB = @UMFPACK_LIB@ 350UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/modules/data_structures/macros/struct.sci b/scilab/modules/data_structures/macros/struct.sci
index de41446..b147071 100644
--- a/scilab/modules/data_structures/macros/struct.sci
+++ b/scilab/modules/data_structures/macros/struct.sci
@@ -13,7 +13,7 @@ function s=struct(varargin)
13 13
14rhs=argn(2) 14rhs=argn(2)
15 15
16fields=["st","dims"] 16fields=["st","dims"];
17 17
18if rhs==0 then 18if rhs==0 then
19 // No Matlab equivalent 19 // No Matlab equivalent
@@ -22,13 +22,19 @@ if rhs==0 then
22end 22end
23 23
24if floor(rhs/2)*2<>rhs then 24if floor(rhs/2)*2<>rhs then
25 error(msprintf(gettext("%s: Wrong number of input argument(s) : an even number is expected."),"struct")); 25 error(msprintf(gettext("%s: Wrong number of input argument(s) : an even number is expected.\n"),"struct"));
26end 26end
27 27
28nbfields=size(varargin)/2 28nbfields=size(varargin)/2
29 29
30dims=[] 30dims=[]
31for kf=1:2:size(varargin) 31for kf=1:2:size(varargin)
32 if varargin(kf)=="dims" then
33 error(msprintf(gettext("%s: ''dims'' can not be used as a field name.\n"),"struct"));
34 end
35 if or(varargin(kf)==fields(2:$)) then
36 error(msprintf(gettext("%s: field name ''%s'' defined twice.\n"),"struct",varargin(kf)));
37 end
32 fields=[fields varargin(kf)] 38 fields=[fields varargin(kf)]
33end 39end
34 40
diff --git a/scilab/modules/data_structures/src/c/data_structures.vcproj b/scilab/modules/data_structures/src/c/data_structures.vcproj
index be56944..eada34c 100644
--- a/scilab/modules/data_structures/src/c/data_structures.vcproj
+++ b/scilab/modules/data_structures/src/c/data_structures.vcproj
@@ -43,7 +43,7 @@
43 /> 43 />
44 <Tool 44 <Tool
45 Name="VCCLCompilerTool" 45 Name="VCCLCompilerTool"
46 AdditionalOptions="/arch:IA32" 46 AdditionalOptions=""
47 Optimization="0" 47 Optimization="0"
48 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes" 48 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
49 PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE" 49 PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
@@ -195,7 +195,7 @@
195 /> 195 />
196 <Tool 196 <Tool
197 Name="VCCLCompilerTool" 197 Name="VCCLCompilerTool"
198 AdditionalOptions="/arch:IA32" 198 AdditionalOptions=""
199 Optimization="1" 199 Optimization="1"
200 InlineFunctionExpansion="1" 200 InlineFunctionExpansion="1"
201 FavorSizeOrSpeed="1" 201 FavorSizeOrSpeed="1"
diff --git a/scilab/modules/data_structures/src/fortran/data_structures_f.vfproj b/scilab/modules/data_structures/src/fortran/data_structures_f.vfproj
index cee3b38..fbe0c39 100644
--- a/scilab/modules/data_structures/src/fortran/data_structures_f.vfproj
+++ b/scilab/modules/data_structures/src/fortran/data_structures_f.vfproj
@@ -5,7 +5,7 @@
5 <Platform Name="x64"/></Platforms> 5 <Platform Name="x64"/></Platforms>
6 <Configurations> 6 <Configurations>
7 <Configuration Name="Debug|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary"> 7 <Configuration Name="Debug|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
8 <Tool Name="VFFortranCompilerTool" AdditionalOptions="/arch:IA32" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/> 8 <Tool Name="VFFortranCompilerTool" AdditionalOptions="" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
9 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/data_structures_f.lib"/> 9 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/data_structures_f.lib"/>
10 <Tool Name="VFResourceCompilerTool"/> 10 <Tool Name="VFResourceCompilerTool"/>
11 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 11 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
@@ -20,7 +20,7 @@ del *.def &gt;nul
20cd .."/> 20cd .."/>
21 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration> 21 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
22 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary"> 22 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
23 <Tool Name="VFFortranCompilerTool" AdditionalOptions="/arch:IA32" SuppressStartupBanner="true" Optimization="optimizeMinSpace" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/> 23 <Tool Name="VFFortranCompilerTool" AdditionalOptions="" SuppressStartupBanner="true" Optimization="optimizeMinSpace" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
24 <Tool Name="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/> 24 <Tool Name="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/>
25 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/data_structures_f.lib"/> 25 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/data_structures_f.lib"/>
26 <Tool Name="VFResourceCompilerTool"/> 26 <Tool Name="VFResourceCompilerTool"/>