Add the svn:eol-style = native on all text files under SCI/modules
Pierre Marechal [Thu, 3 Aug 2006 14:16:36 +0000 (14:16 +0000)]
388 files changed:
scilab/modules/Javasci/Javasci.vcproj
scilab/modules/Javasci/etc/javasci.quit
scilab/modules/Javasci/etc/javasci.start
scilab/modules/Javasci/examples/ihm/MaFenetre.java
scilab/modules/Javasci/examples/ihm/Make.bat
scilab/modules/Javasci/examples/ihm/MonEcouteurPourBouton.java
scilab/modules/Javasci/examples/ihm/MonEcouteurPourText.java
scilab/modules/Javasci/examples/ihm/Readme (Windows).txt
scilab/modules/Javasci/examples/ihm/Test-ihm.bat
scilab/modules/Javasci/examples/ihm/Test.java
scilab/modules/Javasci/examples/ihm/WCloser.java
scilab/modules/Javasci/examples/others/Exemple8.java
scilab/modules/Javasci/examples/others/Exemples.bat
scilab/modules/Javasci/examples/others/Make.bat
scilab/modules/Javasci/examples/others/Readme (Windows).txt
scilab/modules/Javasci/examples/others/test.sce
scilab/modules/Javasci/help/eng/helpbuildereng.sce
scilab/modules/Javasci/help/fr/helpbuilderfr.sce
scilab/modules/Javasci/help/helpbuilder.sce
scilab/modules/Javasci/includes/javasci_Scilab2.h
scilab/modules/Javasci/includes/javasci_globals.h
scilab/modules/Javasci/readme.txt
scilab/modules/Javasci/src/c/javasci_SciComplexArray.c
scilab/modules/Javasci/src/c/javasci_Scilab.c
scilab/modules/Javasci/src/c/javasci_Scilab2.c
scilab/modules/Javasci/src/java/SciComplex.java
scilab/modules/Javasci/src/java/SciComplexArray.java
scilab/modules/Javasci/src/java/SciDoubleArray.java
scilab/modules/Javasci/src/java/Scilab.java
scilab/modules/core/includes/InitScilab.h
scilab/modules/core/includes/sciquit.h
scilab/modules/core/sci_gateway/c/sci_addinter.c
scilab/modules/core/sci_gateway/c/sci_arg.c
scilab/modules/core/sci_gateway/c/sci_banner.c
scilab/modules/core/sci_gateway/c/sci_c_link.c
scilab/modules/core/sci_gateway/c/sci_call.c
scilab/modules/core/sci_gateway/c/sci_chdir.c
scilab/modules/core/sci_gateway/c/sci_clear.c
scilab/modules/core/sci_gateway/c/sci_clearfun.c
scilab/modules/core/sci_gateway/c/sci_clearglobal.c
scilab/modules/core/sci_gateway/c/sci_comp.c
scilab/modules/core/sci_gateway/c/sci_debug.c
scilab/modules/core/sci_gateway/c/sci_delbpt.c
scilab/modules/core/sci_gateway/c/sci_dispbpt.c
scilab/modules/core/sci_gateway/c/sci_errcatch.c
scilab/modules/core/sci_gateway/c/sci_errclear.c
scilab/modules/core/sci_gateway/c/sci_error.c
scilab/modules/core/sci_gateway/c/sci_exists.c
scilab/modules/core/sci_gateway/c/sci_format.c
scilab/modules/core/sci_gateway/c/sci_fromc.c
scilab/modules/core/sci_gateway/c/sci_fromjava.c
scilab/modules/core/sci_gateway/c/sci_funcprot.c
scilab/modules/core/sci_gateway/c/sci_funptr.c
scilab/modules/core/sci_gateway/c/sci_getcwd.c
scilab/modules/core/sci_gateway/c/sci_gethistory.c
scilab/modules/core/sci_gateway/c/sci_getmd5.c
scilab/modules/core/sci_gateway/c/sci_getmemory.c
scilab/modules/core/sci_gateway/c/sci_getos.c
scilab/modules/core/sci_gateway/c/sci_getversion.c
scilab/modules/core/sci_gateway/c/sci_global.c
scilab/modules/core/sci_gateway/c/sci_gstacksize.c
scilab/modules/core/sci_gateway/c/sci_havewindow.c
scilab/modules/core/sci_gateway/c/sci_ieee.c
scilab/modules/core/sci_gateway/c/sci_intppty.c
scilab/modules/core/sci_gateway/c/sci_isdef.c
scilab/modules/core/sci_gateway/c/sci_iserror.c
scilab/modules/core/sci_gateway/c/sci_isglobal.c
scilab/modules/core/sci_gateway/c/sci_lasterror.c
scilab/modules/core/sci_gateway/c/sci_lines.c
scilab/modules/core/sci_gateway/c/sci_link.c
scilab/modules/core/sci_gateway/c/sci_loadhistory.c
scilab/modules/core/sci_gateway/c/sci_macr2lst.c
scilab/modules/core/sci_gateway/c/sci_macr2tree.c
scilab/modules/core/sci_gateway/c/sci_mode.c
scilab/modules/core/sci_gateway/c/sci_mtlb_mode.c
scilab/modules/core/sci_gateway/c/sci_newfun.c
scilab/modules/core/sci_gateway/c/sci_predef.c
scilab/modules/core/sci_gateway/c/sci_pwd.c
scilab/modules/core/sci_gateway/c/sci_resethistory.c
scilab/modules/core/sci_gateway/c/sci_resume.c
scilab/modules/core/sci_gateway/c/sci_return.c
scilab/modules/core/sci_gateway/c/sci_savehistory.c
scilab/modules/core/sci_gateway/c/sci_sciargs.c
scilab/modules/core/sci_gateway/c/sci_setbpt.c
scilab/modules/core/sci_gateway/c/sci_stacksize.c
scilab/modules/core/sci_gateway/c/sci_type.c
scilab/modules/core/sci_gateway/c/sci_typename.c
scilab/modules/core/sci_gateway/c/sci_ulink.c
scilab/modules/core/sci_gateway/c/sci_warning.c
scilab/modules/core/sci_gateway/c/sci_what.c
scilab/modules/core/sci_gateway/c/sci_where.c
scilab/modules/core/sci_gateway/c/sci_whereis.c
scilab/modules/core/sci_gateway/c/sci_who.c
scilab/modules/core/sci_gateway/fortran/sci_addinter.f
scilab/modules/core/sci_gateway/fortran/sci_argn.f
scilab/modules/core/sci_gateway/fortran/sci_c_link.f
scilab/modules/core/sci_gateway/fortran/sci_chdir.f
scilab/modules/core/sci_gateway/fortran/sci_clear.f
scilab/modules/core/sci_gateway/fortran/sci_clearfun.f
scilab/modules/core/sci_gateway/fortran/sci_clearglobal.f
scilab/modules/core/sci_gateway/fortran/sci_comp.f
scilab/modules/core/sci_gateway/fortran/sci_debug.f
scilab/modules/core/sci_gateway/fortran/sci_delbpt.f
scilab/modules/core/sci_gateway/fortran/sci_dispbpt.f
scilab/modules/core/sci_gateway/fortran/sci_errcatch.f
scilab/modules/core/sci_gateway/fortran/sci_errclear.f
scilab/modules/core/sci_gateway/fortran/sci_error.f
scilab/modules/core/sci_gateway/fortran/sci_exists.f
scilab/modules/core/sci_gateway/fortran/sci_format.f
scilab/modules/core/sci_gateway/fortran/sci_fort.f
scilab/modules/core/sci_gateway/fortran/sci_funcprot.f
scilab/modules/core/sci_gateway/fortran/sci_funptr.f
scilab/modules/core/sci_gateway/fortran/sci_getcwd.f
scilab/modules/core/sci_gateway/fortran/sci_global.f
scilab/modules/core/sci_gateway/fortran/sci_gstacksize.f
scilab/modules/core/sci_gateway/fortran/sci_havewindow.f
scilab/modules/core/sci_gateway/fortran/sci_ieee.f
scilab/modules/core/sci_gateway/fortran/sci_intppty.f
scilab/modules/core/sci_gateway/fortran/sci_iserror.f
scilab/modules/core/sci_gateway/fortran/sci_isglobal.f
scilab/modules/core/sci_gateway/fortran/sci_lines.f
scilab/modules/core/sci_gateway/fortran/sci_link.f
scilab/modules/core/sci_gateway/fortran/sci_macrovar.f
scilab/modules/core/sci_gateway/fortran/sci_mode.f
scilab/modules/core/sci_gateway/fortran/sci_mtlb_mode.f
scilab/modules/core/sci_gateway/fortran/sci_newfun.f
scilab/modules/core/sci_gateway/fortran/sci_notify.f
scilab/modules/core/sci_gateway/fortran/sci_predef.f
scilab/modules/core/sci_gateway/fortran/sci_resume.f
scilab/modules/core/sci_gateway/fortran/sci_sciargs.f
scilab/modules/core/sci_gateway/fortran/sci_setbpt.f
scilab/modules/core/sci_gateway/fortran/sci_type.f
scilab/modules/core/sci_gateway/fortran/sci_typnam.f
scilab/modules/core/sci_gateway/fortran/sci_useascommand.f
scilab/modules/core/sci_gateway/fortran/sci_whereis.f
scilab/modules/core/sci_gateway/fortran/sci_who.f
scilab/modules/core/src/c/CallScilab.c
scilab/modules/core/src/c/InitScilab.c
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/fortran/core_f.vfproj
scilab/modules/core/src/fortran/core_f2c.vcproj
scilab/modules/core/src/fortran/inisci.f
scilab/modules/fileio/fileio.vcproj
scilab/modules/fileio/help/eng/helpbuildereng.sce
scilab/modules/fileio/help/fr/helpbuilderfr.sce
scilab/modules/fileio/help/helpbuilder.sce
scilab/modules/fileio/sci_gateway/gw_fileio.c
scilab/modules/fileio/sci_gateway/sci_xls_open.c
scilab/modules/fileio/sci_gateway/sci_xls_read.c
scilab/modules/graphics/etc/graphics.quit
scilab/modules/graphics/etc/graphics.start
scilab/modules/graphics/graphics.vcproj
scilab/modules/graphics/help/eng/color.xml
scilab/modules/graphics/help/eng/getcolor.xml
scilab/modules/graphics/help/eng/helpbuildereng.sce
scilab/modules/graphics/help/eng/name2rgb.xml
scilab/modules/graphics/help/eng/rgb2name.xml
scilab/modules/graphics/help/eng/twinkle.xml
scilab/modules/graphics/help/fr/helpbuilderfr.sce
scilab/modules/graphics/help/helpbuilder.sce
scilab/modules/graphics/macros/%h_get.sci
scilab/modules/graphics/macros/%h_set.sci
scilab/modules/graphics/macros/color.sci
scilab/modules/graphics/sci_gateway/gw_graphics.c
scilab/modules/graphics/src/c/w_rottext.c
scilab/modules/graphics/src/gd/gd.vcproj
scilab/modules/graphics/src/xdr/xdr.vcproj
scilab/modules/graphics/tcl/ged/ObjectsBrowser.tcl
scilab/modules/graphics/unit_tests/readgif.tst
scilab/modules/graphics/unit_tests/readxbm.tst
scilab/modules/helptools/help.dtd
scilab/modules/helptools/macros/xmltohtml.sci
scilab/modules/io/etc/io.quit
scilab/modules/io/etc/io.start
scilab/modules/io/licence.txt
scilab/modules/io/sci_gateway/c/gw_io.c
scilab/modules/io/sci_gateway/c/sci_deff.c
scilab/modules/io/sci_gateway/c/sci_diary.c
scilab/modules/io/sci_gateway/c/sci_disp.c
scilab/modules/io/sci_gateway/c/sci_exec.c
scilab/modules/io/sci_gateway/c/sci_execstr.c
scilab/modules/io/sci_gateway/c/sci_file.c
scilab/modules/io/sci_gateway/c/sci_fileinfo.c
scilab/modules/io/sci_gateway/c/sci_getenv.c
scilab/modules/io/sci_gateway/c/sci_getf.c
scilab/modules/io/sci_gateway/c/sci_getio.c
scilab/modules/io/sci_gateway/c/sci_getpid.c
scilab/modules/io/sci_gateway/c/sci_host.c
scilab/modules/io/sci_gateway/c/sci_lib.c
scilab/modules/io/sci_gateway/c/sci_load.c
scilab/modules/io/sci_gateway/c/sci_mgetl.c
scilab/modules/io/sci_gateway/c/sci_oldload.c
scilab/modules/io/sci_gateway/c/sci_oldsave.c
scilab/modules/io/sci_gateway/c/sci_print.c
scilab/modules/io/sci_gateway/c/sci_rat.c
scilab/modules/io/sci_gateway/c/sci_read.c
scilab/modules/io/sci_gateway/c/sci_read4b.c
scilab/modules/io/sci_gateway/c/sci_readb.c
scilab/modules/io/sci_gateway/c/sci_save.c
scilab/modules/io/sci_gateway/c/sci_setenv.c
scilab/modules/io/sci_gateway/c/sci_unix.c
scilab/modules/io/sci_gateway/c/sci_write.c
scilab/modules/io/sci_gateway/c/sci_write4b.c
scilab/modules/io/sci_gateway/c/sci_writeb.c
scilab/modules/io/src/c/io.vcproj
scilab/modules/io/src/fortran/io_f.vfproj
scilab/modules/m2sci/etc/m2sci.quit
scilab/modules/m2sci/etc/m2sci.start
scilab/modules/m2sci/licence.txt
scilab/modules/m2sci/macros/m2sci/sci_files/sci_besseli.sci
scilab/modules/m2sci/macros/m2sci/sci_files/sci_besselj.sci
scilab/modules/m2sci/macros/m2sci/sci_files/sci_besselk.sci
scilab/modules/m2sci/macros/m2sci/sci_files/sci_bessely.sci
scilab/modules/m2sci/macros/m2sci/sci_files/sci_cellstr.sci
scilab/modules/m2sci/macros/mtlb/char.sci
scilab/modules/maple/etc/maple.quit
scilab/modules/maple/etc/maple.start
scilab/modules/maple/help/eng/helpbuildereng.sce
scilab/modules/maple/help/fr/helpbuilderfr.sce
scilab/modules/maple/help/helpbuilder.sce
scilab/modules/maple/readme.txt
scilab/modules/maple/unit tests/examples.dia.ref
scilab/modules/metanet/etc/metanet.quit
scilab/modules/metanet/etc/metanet.start
scilab/modules/metanet/help/eng/helpbuildereng.sce
scilab/modules/metanet/help/fr/helpbuilderfr.sce
scilab/modules/metanet/help/helpbuilder.sce
scilab/modules/metanet/sci_gateway/gw_metanet.c
scilab/modules/metanet/sci_gateway/sci_m6bandred.f
scilab/modules/metanet/sci_gateway/sci_m6bmatch.f
scilab/modules/metanet/sci_gateway/sci_m6busack.f
scilab/modules/metanet/sci_gateway/sci_m6cent.f
scilab/modules/metanet/sci_gateway/sci_m6chcm.f
scilab/modules/metanet/sci_gateway/sci_m6clique.f
scilab/modules/metanet/sci_gateway/sci_m6clique1.f
scilab/modules/metanet/sci_gateway/sci_m6compc.f
scilab/modules/metanet/sci_gateway/sci_m6compfc.f
scilab/modules/metanet/sci_gateway/sci_m6concom.f
scilab/modules/metanet/sci_gateway/sci_m6deumesh.f
scilab/modules/metanet/sci_gateway/sci_m6dfs.f
scilab/modules/metanet/sci_gateway/sci_m6dfs2.f
scilab/modules/metanet/sci_gateway/sci_m6diam.f
scilab/modules/metanet/sci_gateway/sci_m6dijkst.f
scilab/modules/metanet/sci_gateway/sci_m6dmtree.f
scilab/modules/metanet/sci_gateway/sci_m6edge2st.f
scilab/modules/metanet/sci_gateway/sci_m6findiso.f
scilab/modules/metanet/sci_gateway/sci_m6flomax.f
scilab/modules/metanet/sci_gateway/sci_m6floqua.f
scilab/modules/metanet/sci_gateway/sci_m6ford.f
scilab/modules/metanet/sci_gateway/sci_m6fordfulk.f
scilab/modules/metanet/sci_gateway/sci_m6frang.f
scilab/modules/metanet/sci_gateway/sci_m6hamil.f
scilab/modules/metanet/sci_gateway/sci_m6hullcvex.f
scilab/modules/metanet/sci_gateway/sci_m6johns.f
scilab/modules/metanet/sci_gateway/sci_m6kilter.f
scilab/modules/metanet/sci_gateway/sci_m6knapsk.f
scilab/modules/metanet/sci_gateway/sci_m6loadg.f
scilab/modules/metanet/sci_gateway/sci_m6lp2tad.f
scilab/modules/metanet/sci_gateway/sci_m6lp2tau.f
scilab/modules/metanet/sci_gateway/sci_m6mesh2b.f
scilab/modules/metanet/sci_gateway/sci_m6meshmesh.f
scilab/modules/metanet/sci_gateway/sci_m6ns2p.f
scilab/modules/metanet/sci_gateway/sci_m6p2ns.f
scilab/modules/metanet/sci_gateway/sci_m6pcchna.f
scilab/modules/metanet/sci_gateway/sci_m6permuto.f
scilab/modules/metanet/sci_gateway/sci_m6prevn2p.f
scilab/modules/metanet/sci_gateway/sci_m6prevn2st.f
scilab/modules/metanet/sci_gateway/sci_m6prfmatch.f
scilab/modules/metanet/sci_gateway/sci_m6relax.f
scilab/modules/metanet/sci_gateway/sci_m6saveg.f
scilab/modules/metanet/sci_gateway/sci_m6sconcom.f
scilab/modules/metanet/sci_gateway/sci_m6ta2lpd.f
scilab/modules/metanet/sci_gateway/sci_m6ta2lpu.f
scilab/modules/metanet/sci_gateway/sci_m6tconex.f
scilab/modules/metanet/sci_gateway/sci_m6transc.f
scilab/modules/metanet/sci_gateway/sci_m6umtree.f
scilab/modules/metanet/sci_gateway/sci_m6umtree1.f
scilab/modules/metanet/sci_gateway/sci_m6visitor.f
scilab/modules/metanet/src/c/metanet.vcproj
scilab/modules/metanet/src/fortran/ford.f
scilab/modules/metanet/src/fortran/metanet_f.vfproj
scilab/modules/metanet/src/fortran/metanet_f2c.vcproj
scilab/modules/pvm/etc/pvm.quit
scilab/modules/pvm/etc/pvm.start
scilab/modules/pvm/help/eng/helpbuildereng.sce
scilab/modules/pvm/help/fr/helpbuilderfr.sce
scilab/modules/pvm/help/helpbuilder.sce
scilab/modules/pvm/licence.txt
scilab/modules/pvm/pvm.vcproj
scilab/modules/pvm/pvmconf.bat
scilab/modules/scicos/etc/scicos.quit
scilab/modules/scicos/etc/scicos.start
scilab/modules/scicos/licence.txt
scilab/modules/scicos/macros/scicos_blocks/Electrical/Capacitor.mo
scilab/modules/scicos/macros/scicos_blocks/Electrical/Diode.mo
scilab/modules/scicos/macros/scicos_blocks/Electrical/ExternFunction.mo
scilab/modules/scicos/macros/scicos_blocks/Electrical/Ground.mo
scilab/modules/scicos/macros/scicos_blocks/Electrical/Inductor.mo
scilab/modules/scicos/macros/scicos_blocks/Electrical/Pin.mo
scilab/modules/scicos/macros/scicos_blocks/Electrical/Resistor.mo
scilab/modules/scicos/macros/scicos_blocks/Electrical/VVsourceAC.mo
scilab/modules/scicos/macros/scicos_blocks/Electrical/VariableResistor.mo
scilab/modules/scicos/macros/scicos_blocks/Electrical/VsourceAC.mo
scilab/modules/scicos/macros/scicos_blocks/Electrical/VsourceDC.mo
scilab/modules/scicos/macros/scicos_blocks/Hydraulics/Bache.mo
scilab/modules/scicos/macros/scicos_blocks/Hydraulics/PerteDP.mo
scilab/modules/scicos/macros/scicos_blocks/Hydraulics/PortPHQ1.mo
scilab/modules/scicos/macros/scicos_blocks/Hydraulics/PortPHQ2.mo
scilab/modules/scicos/macros/scicos_blocks/Hydraulics/Puits.mo
scilab/modules/scicos/macros/scicos_blocks/Hydraulics/Source.mo
scilab/modules/scicos/macros/scicos_blocks/Hydraulics/ThermoCarre.mo
scilab/modules/scicos/macros/scicos_blocks/Hydraulics/VanneReglante.mo
scilab/modules/scicos/macros/scicos_blocks/Hydraulics/bache_inputs.sci
scilab/modules/scicos/macros/scicos_blocks/Hydraulics/bache_outputs.sci
scilab/modules/scicos/macros/scicos_blocks/Hydraulics/puit_inputs.sci
scilab/modules/scicos/macros/scicos_blocks/Hydraulics/source_inputs.sci
scilab/modules/scicos/macros/scicos_blocks/Hydraulics/vanne_inputs.sci
scilab/modules/scicos/macros/scicos_blocks/Hydraulics/vanne_outputs.sci
scilab/modules/scicos/sci_gateway/c/gw_scicos.c
scilab/modules/scicos/sci_gateway/c/sci_curblock.c
scilab/modules/scicos/sci_gateway/c/sci_getblocklabel.c
scilab/modules/scicos/sci_gateway/c/sci_sci_tree2.c
scilab/modules/scicos/sci_gateway/c/sci_sci_tree3.c
scilab/modules/scicos/sci_gateway/c/sci_sci_tree4.c
scilab/modules/scicos/sci_gateway/c/sci_scicos_debug.c
scilab/modules/scicos/sci_gateway/c/sci_scicos_debug_count.c
scilab/modules/scicos/sci_gateway/c/sci_sctree.c
scilab/modules/scicos/sci_gateway/c/sci_var2vec.c
scilab/modules/scicos/sci_gateway/c/sci_vec2var.c
scilab/modules/scicos/sci_gateway/fortran/sci_ctree.f
scilab/modules/scicos/sci_gateway/fortran/sci_curblock.f
scilab/modules/scicos/sci_gateway/fortran/sci_debug_count.f
scilab/modules/scicos/sci_gateway/fortran/sci_getblocklabel.f
scilab/modules/scicos/sci_gateway/fortran/sci_scicos_debug.f
scilab/modules/scicos/sci_gateway/fortran/sci_tree2.f
scilab/modules/scicos/sci_gateway/fortran/sci_tree3.f
scilab/modules/scicos/sci_gateway/fortran/sci_tree4.f
scilab/modules/scicos/sci_gateway/fortran/sci_var2vec.f
scilab/modules/scicos/sci_gateway/fortran/sci_vec2var.f
scilab/modules/scicos/src/c/scicos.vcproj
scilab/modules/scicos/src/fortran/scicos_f.vfproj
scilab/modules/scicos/src/fortran/scicos_f2c.vcproj
scilab/modules/scicos/src/ocaml/Modelicac.vcproj
scilab/modules/scicos/src/ocaml/causalityGraph.mli
scilab/modules/scipad/etc/scipad.quit
scilab/modules/scipad/etc/scipad.start
scilab/modules/scipad/help/eng/helpbuildereng.sce
scilab/modules/scipad/help/fr/helpbuilderfr.sce
scilab/modules/scipad/help/helpbuilder.sce
scilab/modules/scipad/licence.txt
scilab/modules/scipad/tcl/CHANGELOG
scilab/modules/scipad/tcl/defaults.tcl
scilab/modules/sound/etc/sound.quit
scilab/modules/sound/etc/sound.start
scilab/modules/sound/help/eng/helpbuildereng.sce
scilab/modules/sound/help/fr/helpbuilderfr.sce
scilab/modules/sound/help/helpbuilder.sce
scilab/modules/sound/licence.txt
scilab/modules/sound/sound.vcproj
scilab/modules/sound/unit_tests/analyse.tst
scilab/modules/sound/unit_tests/beep.tst
scilab/modules/sound/unit_tests/mapsound.tst
scilab/modules/sound/unit_tests/playsnd.tst
scilab/modules/sound/unit_tests/savewave.tst
scilab/modules/sound/unit_tests/wavread.tst
scilab/modules/tclsci/demos/sciGUI/sciGUIdemo.dpf
scilab/modules/tclsci/demos/sciGUI/test_demoplay.dpf
scilab/modules/tclsci/etc/tclsci.quit
scilab/modules/tclsci/etc/tclsci.start
scilab/modules/tclsci/help/eng/helpbuildereng.sce
scilab/modules/tclsci/help/fr/helpbuilderfr.sce
scilab/modules/tclsci/help/helpbuilder.sce
scilab/modules/tclsci/macros/tk_savefile.sci
scilab/modules/tclsci/sci_gateway/gw_tclsci.c
scilab/modules/tclsci/src/EnvTclTk.c
scilab/modules/tclsci/src/setenvtcl.c
scilab/modules/tclsci/tcl/BWidget-1.7.0/LICENSE.txt
scilab/modules/tclsci/tclsci.vcproj
scilab/modules/texmacs/etc/texmacs.quit
scilab/modules/texmacs/etc/texmacs.start
scilab/modules/texmacs/licence.txt
scilab/modules/time/etc/time.quit
scilab/modules/time/etc/time.start
scilab/modules/time/help/eng/helpbuildereng.sce
scilab/modules/time/help/fr/helpbuilderfr.sce
scilab/modules/time/help/helpbuilder.sce
scilab/modules/time/licence.txt
scilab/modules/time/time.vcproj

index 9dd83be..eebf56e 100644 (file)
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="8,00"\r
-       Name="Javasci"\r
-       ProjectGUID="{0BD503EF-5CB6-4277-BAC4-8955C97F247D}"\r
-       Keyword="Win32Proj"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="includes; ../../libs/MALLOC/includes; ../core/includes; ../../Java/jdk1.5.0_06/include/;../../Java/jdk1.5.0_06/include/win32"\r
-                               PreprocessorDefinitions="_DEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               UsePrecompiledHeader="0"\r
-                               ObjectFile="$(ConfigurationName)/"\r
-                               ProgramDataBaseFileName="$(ConfigurationName)/vc80.pdb"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="4"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               OutputFile="../../bin/Javasci.dll"\r
-                               LinkIncremental="0"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)/Javasci.pdb"\r
-                               SubSystem="2"\r
-                               ImportLibrary="$(OutDir)/Javasci.lib"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               CommandLine="cd src\java&#x0D;&#x0A;MakeJavaClass.bat&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="includes; ../../libs/MALLOC/includes; ../core/includes; ../../Java/jdk1.5.0_06/include/;../../Java/jdk1.5.0_06/include/win32"\r
-                               PreprocessorDefinitions="NDEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE"\r
-                               RuntimeLibrary="2"\r
-                               EnableEnhancedInstructionSet="1"\r
-                               UsePrecompiledHeader="0"\r
-                               ObjectFile="$(ConfigurationName)/"\r
-                               ProgramDataBaseFileName="$(ConfigurationName)/vc80.pdb"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               OutputFile="../../bin/Javasci.dll"\r
-                               LinkIncremental="2"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="0"\r
-                               OptimizeForWindows98="1"\r
-                               ImportLibrary="$(OutDir)/Javasci.lib"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               CommandLine="cd src\java&#x0D;&#x0A;MakeJavaClass.bat&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Source Files"\r
-                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       >\r
-                       <File\r
-                               RelativePath=".\src\c\DllmainJavasci.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\c\javasci_globals.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\c\javasci_SciComplexArray.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\c\javasci_SciDoubleArray.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\c\javasci_Scilab.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\c\javasci_Scilab2.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\c\javasci_SciStringArray.c"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
-                       >\r
-                       <File\r
-                               RelativePath=".\includes\javasci_globals.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\includes\javasci_SciComplexArray.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\includes\javasci_SciDoubleArray.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\includes\javasci_Scilab.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\includes\javasci_Scilab2.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\includes\javasci_SciStringArray.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       >\r
-               </Filter>\r
-               <Filter\r
-                       Name="Java Class"\r
-                       >\r
-                       <File\r
-                               RelativePath=".\src\java\BadDataArgumentException.java"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\java\MakeJavaClass.bat"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\java\SciComplex.java"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\java\SciComplexArray.java"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\java\SciDouble.java"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\java\SciDoubleArray.java"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\java\Scilab.java"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\java\SciString.java"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\java\SciStringArray.java"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="8,00"
+       Name="Javasci"
+       ProjectGUID="{0BD503EF-5CB6-4277-BAC4-8955C97F247D}"
+       Keyword="Win32Proj"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="includes; ../../libs/MALLOC/includes; ../core/includes; ../../Java/jdk1.5.0_06/include/;../../Java/jdk1.5.0_06/include/win32"
+                               PreprocessorDefinitions="_DEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="0"
+                               ObjectFile="$(ConfigurationName)/"
+                               ProgramDataBaseFileName="$(ConfigurationName)/vc80.pdb"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="true"
+                               DebugInformationFormat="4"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               OutputFile="../../bin/Javasci.dll"
+                               LinkIncremental="0"
+                               GenerateDebugInformation="true"
+                               ProgramDatabaseFile="$(OutDir)/Javasci.pdb"
+                               SubSystem="2"
+                               ImportLibrary="$(OutDir)/Javasci.lib"
+                               TargetMachine="1"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCWebDeploymentTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                               CommandLine="cd src\java&#x0D;&#x0A;MakeJavaClass.bat&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalIncludeDirectories="includes; ../../libs/MALLOC/includes; ../core/includes; ../../Java/jdk1.5.0_06/include/;../../Java/jdk1.5.0_06/include/win32"
+                               PreprocessorDefinitions="NDEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+                               RuntimeLibrary="2"
+                               EnableEnhancedInstructionSet="1"
+                               UsePrecompiledHeader="0"
+                               ObjectFile="$(ConfigurationName)/"
+                               ProgramDataBaseFileName="$(ConfigurationName)/vc80.pdb"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="true"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               OutputFile="../../bin/Javasci.dll"
+                               LinkIncremental="2"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="0"
+                               OptimizeForWindows98="1"
+                               ImportLibrary="$(OutDir)/Javasci.lib"
+                               TargetMachine="1"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCWebDeploymentTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                               CommandLine="cd src\java&#x0D;&#x0A;MakeJavaClass.bat&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;"
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+                       >
+                       <File
+                               RelativePath=".\src\c\DllmainJavasci.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\javasci_globals.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\javasci_SciComplexArray.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\javasci_SciDoubleArray.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\javasci_Scilab.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\javasci_Scilab2.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\javasci_SciStringArray.c"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Header Files"
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+                       >
+                       <File
+                               RelativePath=".\includes\javasci_globals.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\includes\javasci_SciComplexArray.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\includes\javasci_SciDoubleArray.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\includes\javasci_Scilab.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\includes\javasci_Scilab2.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\includes\javasci_SciStringArray.h"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Resource Files"
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+                       >
+               </Filter>
+               <Filter
+                       Name="Java Class"
+                       >
+                       <File
+                               RelativePath=".\src\java\BadDataArgumentException.java"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\java\MakeJavaClass.bat"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\java\SciComplex.java"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\java\SciComplexArray.java"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\java\SciDouble.java"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\java\SciDoubleArray.java"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\java\Scilab.java"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\java\SciString.java"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\java\SciStringArray.java"
+                               >
+                       </File>
+               </Filter>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>
index e47e6ac..357ab2c 100644 (file)
@@ -1,16 +1,16 @@
-// ====================================================================\r
-// This file contains command to be executed at the end \r
-// of a scilab session for javasci module\r
-// Copyright INRIA 2006\r
-// ====================================================================\r
-// delete help chapter\r
-global LANGUAGE\r
-\r
-if LANGUAGE == 'fr' then\r
-       del_help_chapter("Interface Java");\r
-elseif LANGUAGE == 'eng' then\r
-       del_help_chapter("Java Interface");\r
-end\r
-\r
-clear del_help_chapter LANGUAGE;\r
+// ====================================================================
+// This file contains command to be executed at the end 
+// of a scilab session for javasci module
+// Copyright INRIA 2006
+// ====================================================================
+// delete help chapter
+global LANGUAGE
+
+if LANGUAGE == 'fr' then
+       del_help_chapter("Interface Java");
+elseif LANGUAGE == 'eng' then
+       del_help_chapter("Java Interface");
+end
+
+clear del_help_chapter LANGUAGE;
 // ====================================================================
\ No newline at end of file
index 45543d6..b967a79 100644 (file)
@@ -1,23 +1,23 @@
-// ====================================================================\r
-// Javasci module initialisation file \r
-// Copyright INRIA 2006\r
-// ====================================================================\r
-//Load  functions librarie\r
-//load('SCI/modules/Javasci/macros/lib');\r
-// ====================================================================\r
-//add help chapter\r
-global LANGUAGE\r
-\r
-path = get_absolute_file_path('javasci.start');\r
-path = getshortpathname(path);\r
-\r
-if LANGUAGE == 'fr' then\r
-       path = pathconvert(part(path,1:(length(path)-5))+'/help/fr',%f,%f);\r
-       add_help_chapter("Interface Java",path);\r
-elseif LANGUAGE == 'eng' then\r
-       path = pathconvert(part(path,1:(length(path)-5))+'/help/eng',%f,%f);\r
-       add_help_chapter("Java Interface",path);\r
-end\r
-\r
-clear path get_absolute_file_path add_help_chapter LANGUAGE;\r
-// ====================================================================\r
+// ====================================================================
+// Javasci module initialisation file 
+// Copyright INRIA 2006
+// ====================================================================
+//Load  functions librarie
+//load('SCI/modules/Javasci/macros/lib');
+// ====================================================================
+//add help chapter
+global LANGUAGE
+
+path = get_absolute_file_path('javasci.start');
+path = getshortpathname(path);
+
+if LANGUAGE == 'fr' then
+       path = pathconvert(part(path,1:(length(path)-5))+'/help/fr',%f,%f);
+       add_help_chapter("Interface Java",path);
+elseif LANGUAGE == 'eng' then
+       path = pathconvert(part(path,1:(length(path)-5))+'/help/eng',%f,%f);
+       add_help_chapter("Java Interface",path);
+end
+
+clear path get_absolute_file_path add_help_chapter LANGUAGE;
+// ====================================================================
index 137bae6..1caea5d 100644 (file)
@@ -1,17 +1,17 @@
-import java.awt.*;\r
-import java.awt.event.*;\r
-\r
-public class MaFenetre extends Frame\r
-{\r
-  private MonPanneau p;\r
-       \r
-  public MaFenetre()\r
-  {\r
-    super("Mon Titre"); // invocation du constructeur de Frame\r
-    p=new MonPanneau();\r
-    this.setLayout(new FlowLayout());\r
-    this.add(p);\r
-    this.pack();\r
-    this.addWindowListener(new WCloser());\r
-  }\r
-}\r
+import java.awt.*;
+import java.awt.event.*;
+
+public class MaFenetre extends Frame
+{
+  private MonPanneau p;
+       
+  public MaFenetre()
+  {
+    super("Mon Titre"); // invocation du constructeur de Frame
+    p=new MonPanneau();
+    this.setLayout(new FlowLayout());
+    this.add(p);
+    this.pack();
+    this.addWindowListener(new WCloser());
+  }
+}
index 859d1a8..7ba2d41 100644 (file)
@@ -1,11 +1,11 @@
-@echo off\r
-rem Allan CORNET\r
-rem INRIA Juillet 2004\r
-\r
-rem A modifier selon votre répertoire d'installation de Java(TM) 2 SDK, Standard Edition Version 1.4.2\r
-PATH=%PATH%;c:\Wintools\JBuilder9\jdk1.4\bin;\r
-\r
-rem Compilation des exemples\r
-javac -deprecation -d ..\..\..\..\bin -classpath ..\..\..\..\bin *.java\r
-echo on\r
-\r
+@echo off
+rem Allan CORNET
+rem INRIA Juillet 2004
+
+rem A modifier selon votre répertoire d'installation de Java(TM) 2 SDK, Standard Edition Version 1.4.2
+PATH=%PATH%;c:\Wintools\JBuilder9\jdk1.4\bin;
+
+rem Compilation des exemples
+javac -deprecation -d ..\..\..\..\bin -classpath ..\..\..\..\bin *.java
+echo on
+
index 3e42a62..9d54c09 100644 (file)
@@ -1,22 +1,22 @@
-import java.awt.event.*;\r
-import javasci.*;\r
-import java.awt.*;\r
-\r
-public class MonEcouteurPourBouton implements ActionListener\r
-{\r
-  private MonPanneau appli;\r
-  public MonEcouteurPourBouton(MonPanneau qui)\r
-  {\r
-    appli=qui; \r
-  }\r
-  public void actionPerformed(ActionEvent e)\r
-  {\r
-    int i=0;\r
-    appli.YA_EU_UN_Click();\r
-    System.out.println(e);\r
-  }\r
-}\r
-\r
-\r
-\r
-       \r
+import java.awt.event.*;
+import javasci.*;
+import java.awt.*;
+
+public class MonEcouteurPourBouton implements ActionListener
+{
+  private MonPanneau appli;
+  public MonEcouteurPourBouton(MonPanneau qui)
+  {
+    appli=qui; 
+  }
+  public void actionPerformed(ActionEvent e)
+  {
+    int i=0;
+    appli.YA_EU_UN_Click();
+    System.out.println(e);
+  }
+}
+
+
+
+       
index 33942ab..0e534ec 100644 (file)
@@ -1,15 +1,15 @@
-import java.awt.event.*;\r
-\r
-public class MonEcouteurPourText implements TextListener\r
-{\r
-  private MonPanneau appli;\r
-  public MonEcouteurPourText(MonPanneau qui)\r
-  {\r
-    appli=qui; \r
-  }\r
-  public void textValueChanged(TextEvent e)\r
-  {\r
-    appli.recupTexte();        \r
-    System.out.println(e);\r
-  }\r
-}\r
+import java.awt.event.*;
+
+public class MonEcouteurPourText implements TextListener
+{
+  private MonPanneau appli;
+  public MonEcouteurPourText(MonPanneau qui)
+  {
+    appli=qui; 
+  }
+  public void textValueChanged(TextEvent e)
+  {
+    appli.recupTexte();        
+    System.out.println(e);
+  }
+}
index 11ecc49..14af1c6 100644 (file)
@@ -1,6 +1,6 @@
-execute Make.bat to compile this example\r
-\r
-execute Test-ihm.bat to test this example\r
-\r
-Allan CORNET\r
-\r
+execute Make.bat to compile this example
+
+execute Test-ihm.bat to test this example
+
+Allan CORNET
+
index 8f68d55..4c90aaf 100644 (file)
@@ -1,10 +1,10 @@
-@echo off\r
-rem Allan CORNET\r
-rem INRIA 2006\r
-\r
-SET JAVA="../Java/jre1.5.0_06/bin/java.exe"\r
-\r
-cd ..\..\..\..\bin\r
-%JAVA% Test\r
-echo on\r
-\r
+@echo off
+rem Allan CORNET
+rem INRIA 2006
+
+SET JAVA="../Java/jre1.5.0_06/bin/java.exe"
+
+cd ..\..\..\..\bin
+%JAVA% Test
+echo on
+
index 3c79b57..dd3e3a5 100644 (file)
@@ -1,9 +1,9 @@
-\r
-public class Test\r
-{\r
-  public static void main(String[] args)\r
-  {\r
-    MaFenetre F = new MaFenetre();\r
-    F.setVisible(true);\r
-  }\r
-}\r
+
+public class Test
+{
+  public static void main(String[] args)
+  {
+    MaFenetre F = new MaFenetre();
+    F.setVisible(true);
+  }
+}
index d4fd6f4..7b028b3 100644 (file)
@@ -1,13 +1,13 @@
-import java.awt.event.*;\r
-//import java.awt.*;\r
-public class WCloser implements WindowListener\r
-{\r
-       public void windowOpened(WindowEvent e){}\r
-       public void windowClosing(WindowEvent e){System.exit(0);}\r
-       public void windowClosed(WindowEvent e){}\r
-       public void windowIconified(WindowEvent e){}\r
-       public void windowDeiconified(WindowEvent e){}\r
-       public void windowActivated(WindowEvent e){}\r
-       public void windowDeactivated(WindowEvent e){}\r
-       \r
-}\r
+import java.awt.event.*;
+//import java.awt.*;
+public class WCloser implements WindowListener
+{
+       public void windowOpened(WindowEvent e){}
+       public void windowClosing(WindowEvent e){System.exit(0);}
+       public void windowClosed(WindowEvent e){}
+       public void windowIconified(WindowEvent e){}
+       public void windowDeiconified(WindowEvent e){}
+       public void windowActivated(WindowEvent e){}
+       public void windowDeactivated(WindowEvent e){}
+       
+}
index dfaacf2..c768dbb 100644 (file)
@@ -1,23 +1,23 @@
-import javasci.* ; \r
-\r
-class  Exemple8 {\r
-\r
-  public static void main(String[] args) \r
-  {\r
-  \r
-    SciString SCIPATH = new SciString("SCILABROOTPATH");\r
-    Scilab.Exec("SCILABROOTPATH=getenv(''SCI'')");\r
-    \r
-    Scilab.ExecuteScilabScript(SCIPATH.getData()+"/modules/Javasci/examples/others/test.sce");\r
-    \r
-    /* "notest.sce" not exist */\r
-    if (! Scilab.ExecuteScilabScript(SCIPATH.getData()+"/modules/Javasci/examples/others/test2.sce") )\r
-    {\r
-       System.out.println("Scilab Error code : "+Scilab.GetLastErrorCode());\r
-    }\r
-     \r
-    Scilab.Finish();\r
-  }\r
-}\r
-\r
-  \r
+import javasci.* ; 
+
+class  Exemple8 {
+
+  public static void main(String[] args) 
+  {
+  
+    SciString SCIPATH = new SciString("SCILABROOTPATH");
+    Scilab.Exec("SCILABROOTPATH=getenv(''SCI'')");
+    
+    Scilab.ExecuteScilabScript(SCIPATH.getData()+"/modules/Javasci/examples/others/test.sce");
+    
+    /* "notest.sce" not exist */
+    if (! Scilab.ExecuteScilabScript(SCIPATH.getData()+"/modules/Javasci/examples/others/test2.sce") )
+    {
+       System.out.println("Scilab Error code : "+Scilab.GetLastErrorCode());
+    }
+     
+    Scilab.Finish();
+  }
+}
+
+  
index 81cb88c..30d265b 100644 (file)
@@ -1,60 +1,60 @@
-@echo off\r
-SET JAVA="../Java/jre1.5.0_06/bin/java.exe"\r
-\r
-rem execution des exemples\r
-cd ..\..\..\..\bin\r
-echo ------------------------------------------------------------------------\r
-echo Exemple 1\r
-echo ------------------------------------------------------------------------\r
-%JAVA% Exemple1\r
-pause\r
-echo ------------------------------------------------------------------------\r
-echo Exemple 2\r
-echo ------------------------------------------------------------------------\r
-%JAVA% Exemple2\r
-pause\r
-echo ------------------------------------------------------------------------\r
-echo Exemple 3\r
-echo ------------------------------------------------------------------------\r
-%JAVA% Exemple3\r
-pause\r
-echo ------------------------------------------------------------------------\r
-echo Exemple 4\r
-echo ------------------------------------------------------------------------\r
-%JAVA% Exemple4\r
-pause\r
-echo ------------------------------------------------------------------------\r
-echo Exemple 5\r
-echo ------------------------------------------------------------------------\r
-%JAVA% Exemple5\r
-pause\r
-echo ------------------------------------------------------------------------\r
-echo Exemple 6\r
-echo ------------------------------------------------------------------------\r
-%JAVA% Exemple6\r
-pause\r
-echo ------------------------------------------------------------------------\r
-echo Exemple 7\r
-echo ------------------------------------------------------------------------\r
-%JAVA% Exemple7A\r
-%JAVA% Exemple7B\r
-echo ------------------------------------------------------------------------\r
-pause\r
-echo Exemple 8\r
-echo ------------------------------------------------------------------------\r
-%JAVA% Exemple8\r
-echo ------------------------------------------------------------------------\r
-pause\r
-echo Exemple 9\r
-echo ------------------------------------------------------------------------\r
-%JAVA% Exemple9\r
-echo ------------------------------------------------------------------------\r
-pause\r
-echo Exemple 10\r
-echo ------------------------------------------------------------------------\r
-%JAVA% Exemple10\r
-echo ------------------------------------------------------------------------\r
-pause\r
-cd ..\examples\callsci\callsciJava\others\r
-@echo on\r
-\r
+@echo off
+SET JAVA="../Java/jre1.5.0_06/bin/java.exe"
+
+rem execution des exemples
+cd ..\..\..\..\bin
+echo ------------------------------------------------------------------------
+echo Exemple 1
+echo ------------------------------------------------------------------------
+%JAVA% Exemple1
+pause
+echo ------------------------------------------------------------------------
+echo Exemple 2
+echo ------------------------------------------------------------------------
+%JAVA% Exemple2
+pause
+echo ------------------------------------------------------------------------
+echo Exemple 3
+echo ------------------------------------------------------------------------
+%JAVA% Exemple3
+pause
+echo ------------------------------------------------------------------------
+echo Exemple 4
+echo ------------------------------------------------------------------------
+%JAVA% Exemple4
+pause
+echo ------------------------------------------------------------------------
+echo Exemple 5
+echo ------------------------------------------------------------------------
+%JAVA% Exemple5
+pause
+echo ------------------------------------------------------------------------
+echo Exemple 6
+echo ------------------------------------------------------------------------
+%JAVA% Exemple6
+pause
+echo ------------------------------------------------------------------------
+echo Exemple 7
+echo ------------------------------------------------------------------------
+%JAVA% Exemple7A
+%JAVA% Exemple7B
+echo ------------------------------------------------------------------------
+pause
+echo Exemple 8
+echo ------------------------------------------------------------------------
+%JAVA% Exemple8
+echo ------------------------------------------------------------------------
+pause
+echo Exemple 9
+echo ------------------------------------------------------------------------
+%JAVA% Exemple9
+echo ------------------------------------------------------------------------
+pause
+echo Exemple 10
+echo ------------------------------------------------------------------------
+%JAVA% Exemple10
+echo ------------------------------------------------------------------------
+pause
+cd ..\examples\callsci\callsciJava\others
+@echo on
+
index 8b18672..f694269 100644 (file)
@@ -1,11 +1,11 @@
-@echo off\r
-rem Allan CORNET\r
-rem INRIA Juillet 2004\r
-\r
-rem A modifier selon votre répertoire d'installation de Java(TM) 2 SDK, Standard Edition Version 1.4.2\r
-PATH=%PATH%;c:\Wintools\JBuilder9\jdk1.4\bin;\r
-\r
-rem Compilation des exemples\r
-javac -deprecation -d ..\..\..\..\bin -classpath ..\..\..\..\bin *.java\r
-@echo on\r
-\r
+@echo off
+rem Allan CORNET
+rem INRIA Juillet 2004
+
+rem A modifier selon votre répertoire d'installation de Java(TM) 2 SDK, Standard Edition Version 1.4.2
+PATH=%PATH%;c:\Wintools\JBuilder9\jdk1.4\bin;
+
+rem Compilation des exemples
+javac -deprecation -d ..\..\..\..\bin -classpath ..\..\..\..\bin *.java
+@echo on
+
index 1c5d7f2..c234b2d 100644 (file)
@@ -1,10 +1,10 @@
-execute Make.bat to compile these examples\r
-\r
-execute :\r
-       Exemples.bat\r
-       ExempleEvents.bat\r
-       ExempleEvent2.bat\r
-\r
-\r
-Allan CORNET\r
-\r
+execute Make.bat to compile these examples
+
+execute :
+       Exemples.bat
+       ExempleEvents.bat
+       ExempleEvent2.bat
+
+
+Allan CORNET
+
index 8b47fe6..b04a977 100644 (file)
@@ -1,2 +1,2 @@
-// Allan CORNET INRIA 2006\r
+// Allan CORNET INRIA 2006
 disp('test ExecuteScilabScript');
\ No newline at end of file
index 2a51a43..11045d3 100644 (file)
@@ -1,6 +1,6 @@
-mode(-1); //force silent execution\r
-path=get_absolute_file_path('helpbuildereng.sce');//get the absolute path of this file\r
-add_help_chapter("Java Interface",path);//add help chapter\r
-xmltohtml(path,"Java Interface");\r
-//clear the variable stack\r
+mode(-1); //force silent execution
+path=get_absolute_file_path('helpbuildereng.sce');//get the absolute path of this file
+add_help_chapter("Java Interface",path);//add help chapter
+xmltohtml(path,"Java Interface");
+//clear the variable stack
 clear path add_help_chapter get_absolute_file_path; 
\ No newline at end of file
index beff9f0..d1eb2bc 100644 (file)
@@ -1,6 +1,6 @@
-mode(-1); //force silent execution\r
-path=get_absolute_file_path('helpbuilderfr.sce');//get the absolute path of this file\r
-add_help_chapter("Interface Java",path);//add help chapter\r
-xmltohtml(path,"Interface Java",'html-rev.xsl');\r
-//clear the variable stack\r
+mode(-1); //force silent execution
+path=get_absolute_file_path('helpbuilderfr.sce');//get the absolute path of this file
+add_help_chapter("Interface Java",path);//add help chapter
+xmltohtml(path,"Interface Java",'html-rev.xsl');
+//clear the variable stack
 clear path add_help_chapter get_absolute_file_path; 
\ No newline at end of file
index a68b52f..12d37e1 100644 (file)
@@ -1,9 +1,9 @@
-mode(-1); //force silent execution\r
-\r
-cd 'eng'\r
-exec helpbuildereng.sce\r
-cd '..'\r
-\r
-cd 'fr'\r
-exec helpbuilderfr.sce\r
-cd '..'\r
+mode(-1); //force silent execution
+
+cd 'eng'
+exec helpbuildereng.sce
+cd '..'
+
+cd 'fr'
+exec helpbuilderfr.sce
+cd '..'
index 1ee04f4..a5d635d 100644 (file)
@@ -1,49 +1,49 @@
-#ifndef _Included_javasci_Scilab2\r
-#define _Included_javasci_Scilab2\r
-/********************************************************************************************************/\r
-/* Arnaud Mangin */\r
-/* INRIA 2006 */\r
-/********************************************************************************************************/\r
-/* Add on  : Javasci for Pro-Active */\r
-/********************************************************************************************************/\r
-#include "javasci_globals.h"\r
-#ifdef __cplusplus\r
-extern "C" \r
-{\r
-#endif\r
-\r
-/**\r
-* private static native void initialize(); \r
-*/\r
-JNIEXPORT void JNICALL Java_javasci_Scilab_initialize(JNIEnv *env, jclass cl);\r
-\r
-/**\r
-* public static native SciData receiveDataByName(String id); */\r
-JNIEXPORT jobject JNICALL Java_javasci_Scilab_receiveDataByName (JNIEnv *env, jclass cl, jstring name);\r
-\r
-/**\r
-public static native void receiveStringMatrix(SciStringMatrix matrix); \r
-*/\r
-JNIEXPORT void JNICALL Java_javasci_Scilab_receiveStringMatrix (JNIEnv *env, jclass cl, jobject objMatrix);\r
-\r
-/**\r
-* public static native void sendStringMatrix(SciStringMatrix matrix); \r
-*/\r
-JNIEXPORT void JNICALL Java_javasci_Scilab_sendStringMatrix (JNIEnv *env, jclass cl, jobject objMatrix);\r
-\r
-/**\r
-* public static native void receiveDoubleMatrix(SciDoubleMatrix matrix); \r
-*/\r
-JNIEXPORT void JNICALL Java_javasci_Scilab_receiveDoubleMatrix (JNIEnv *env, jclass cl, jobject objMatrix);\r
-\r
-/**\r
-* public static native void sendDoubleMatrix(SciDoubleMatrix matrix); \r
-*/\r
-JNIEXPORT void JNICALL Java_javasci_Scilab_sendDoubleMatrix (JNIEnv *env, jclass cl, jobject objMatrix);\r
-\r
-#ifdef __cplusplus\r
-}\r
-#endif\r
-#endif /* _Included_javasci_Scilab2 */\r
-/********************************************************************************************************/\r
-\r
+#ifndef _Included_javasci_Scilab2
+#define _Included_javasci_Scilab2
+/********************************************************************************************************/
+/* Arnaud Mangin */
+/* INRIA 2006 */
+/********************************************************************************************************/
+/* Add on  : Javasci for Pro-Active */
+/********************************************************************************************************/
+#include "javasci_globals.h"
+#ifdef __cplusplus
+extern "C" 
+{
+#endif
+
+/**
+* private static native void initialize(); 
+*/
+JNIEXPORT void JNICALL Java_javasci_Scilab_initialize(JNIEnv *env, jclass cl);
+
+/**
+* public static native SciData receiveDataByName(String id); */
+JNIEXPORT jobject JNICALL Java_javasci_Scilab_receiveDataByName (JNIEnv *env, jclass cl, jstring name);
+
+/**
+public static native void receiveStringMatrix(SciStringMatrix matrix); 
+*/
+JNIEXPORT void JNICALL Java_javasci_Scilab_receiveStringMatrix (JNIEnv *env, jclass cl, jobject objMatrix);
+
+/**
+* public static native void sendStringMatrix(SciStringMatrix matrix); 
+*/
+JNIEXPORT void JNICALL Java_javasci_Scilab_sendStringMatrix (JNIEnv *env, jclass cl, jobject objMatrix);
+
+/**
+* public static native void receiveDoubleMatrix(SciDoubleMatrix matrix); 
+*/
+JNIEXPORT void JNICALL Java_javasci_Scilab_receiveDoubleMatrix (JNIEnv *env, jclass cl, jobject objMatrix);
+
+/**
+* public static native void sendDoubleMatrix(SciDoubleMatrix matrix); 
+*/
+JNIEXPORT void JNICALL Java_javasci_Scilab_sendDoubleMatrix (JNIEnv *env, jclass cl, jobject objMatrix);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _Included_javasci_Scilab2 */
+/********************************************************************************************************/
+
index 73904b1..5f5b84f 100644 (file)
@@ -1,61 +1,61 @@
-#ifndef _Included_javasci_globals\r
-#define _Included_javasci_globals\r
-/********************************************************************************************************/\r
-/* Allan CORNET */\r
-/* INRIA 2005 */\r
-/********************************************************************************************************/\r
-#include <math.h>\r
-#include <stdio.h> \r
-#include <string.h>\r
-#if _MSC_VER\r
-  #include <windows.h>\r
-  #pragma comment(lib, "User32.lib")\r
-#endif\r
-#include "jni.h"\r
-#include "machine.h"\r
-#include "stack-c.h"\r
-\r
-#include "MALLOC.h"\r
-\r
-/********************************************************************************************************/\r
-#ifndef SCI \r
-  #define SCI ".."\r
-#endif \r
-\r
-#ifndef NULL\r
-       #define NULL 0\r
-#endif\r
-/********************************************************************************************************/\r
-#define MAX_STR 512\r
-/********************************************************************************************************/\r
-void EnableInterf();\r
-void DisableInterf();\r
-int GetInterfState();\r
-int send_scilab_job(char *job) ;\r
-void Initialize() ;\r
-/********************************************************************************************************/\r
-extern void C2F(banier)(int *x) ;\r
-extern void initTCLTK();\r
-extern int C2F(inisci)(int *,int *,int *);\r
-extern int C2F (sciquit) (void);\r
-extern void C2F(settmpdir) (void);\r
-extern int C2F(scirun)(char * startup, int lstartup);\r
-extern void C2F(storeversion)(char *str,int n);\r
-extern void sciGetIdFigure (int *vect, int *id, int *flag);\r
-extern int version_flag();\r
-extern void SetFromJavaToON(void);\r
-extern int SendScilabJob(char *job); \r
-extern void ScilabDoOneEvent(void);\r
-extern int ExitScilab(void);\r
-extern int GetLastErrorCode(void);\r
-/********************************************************************************************************/\r
-#if _MSC_VER\r
-extern void start_sci_tcltk();\r
-extern void add_sci_argv();\r
-extern void add_sci_argv();\r
-extern void set_sci_env(char *DefaultSCIPATH);\r
-extern void InitWindowGraphDll(void);\r
-#endif\r
-/********************************************************************************************************/\r
-#endif\r
-/********************************************************************************************************/\r
+#ifndef _Included_javasci_globals
+#define _Included_javasci_globals
+/********************************************************************************************************/
+/* Allan CORNET */
+/* INRIA 2005 */
+/********************************************************************************************************/
+#include <math.h>
+#include <stdio.h> 
+#include <string.h>
+#if _MSC_VER
+  #include <windows.h>
+  #pragma comment(lib, "User32.lib")
+#endif
+#include "jni.h"
+#include "machine.h"
+#include "stack-c.h"
+
+#include "MALLOC.h"
+
+/********************************************************************************************************/
+#ifndef SCI 
+  #define SCI ".."
+#endif 
+
+#ifndef NULL
+       #define NULL 0
+#endif
+/********************************************************************************************************/
+#define MAX_STR 512
+/********************************************************************************************************/
+void EnableInterf();
+void DisableInterf();
+int GetInterfState();
+int send_scilab_job(char *job) ;
+void Initialize() ;
+/********************************************************************************************************/
+extern void C2F(banier)(int *x) ;
+extern void initTCLTK();
+extern int C2F(inisci)(int *,int *,int *);
+extern int C2F (sciquit) (void);
+extern void C2F(settmpdir) (void);
+extern int C2F(scirun)(char * startup, int lstartup);
+extern void C2F(storeversion)(char *str,int n);
+extern void sciGetIdFigure (int *vect, int *id, int *flag);
+extern int version_flag();
+extern void SetFromJavaToON(void);
+extern int SendScilabJob(char *job); 
+extern void ScilabDoOneEvent(void);
+extern int ExitScilab(void);
+extern int GetLastErrorCode(void);
+/********************************************************************************************************/
+#if _MSC_VER
+extern void start_sci_tcltk();
+extern void add_sci_argv();
+extern void add_sci_argv();
+extern void set_sci_env(char *DefaultSCIPATH);
+extern void InitWindowGraphDll(void);
+#endif
+/********************************************************************************************************/
+#endif
+/********************************************************************************************************/
index e4c7ab7..3c698f6 100644 (file)
@@ -1 +1 @@
-please use prerequirements for scilab\r
+please use prerequirements for scilab
index 76ac702..baf7b72 100644 (file)
-#include "javasci_SciComplexArray.h"\r
-/********************************************************************************************************/\r
-/* Allan CORNET */\r
-/* INRIA 2006 */\r
-/********************************************************************************************************/\r
-/* private static native void Initialize(); */\r
-JNIEXPORT void JNICALL Java_javasci_SciComplexArray_Initialize (JNIEnv *env, jclass cl)\r
-{\r
-       if ( GetInterfState() == 0) { EnableInterf(); Initialize();} \r
-}\r
-/********************************************************************************************************/\r
-/*! public native boolean Job(String job); */\r
-JNIEXPORT jboolean JNICALL Java_javasci_SciComplexArray_Job(JNIEnv *env , jobject obj_this, jstring job)\r
-/********************************************************************************************************/\r
-{\r
-       const char *cjob;\r
-       jboolean bOK=0;\r
-\r
-       /* get the class */\r
-       jclass class_Mine = (*env)->GetObjectClass(env, obj_this);\r
-\r
-       /* get the field value */\r
-       cjob = (*env)->GetStringUTFChars(env, job, NULL);\r
-\r
-       if (strlen(cjob) >= MAX_STR)\r
-       {\r
-               fprintf(stderr,"Error in Java_javasci_SciComplexArray_Job routine (line too long).\n");\r
-               bOK=0;\r
-       }\r
-       else\r
-       {\r
-               if (send_scilab_job((char*)cjob))\r
-               {\r
-                       fprintf(stderr,"Error in Java_javasci_SciComplexArray_Job routine.\n");\r
-                       bOK=0;\r
-               }\r
-               else bOK=1;\r
-       }\r
-\r
-       (*env)->ReleaseStringUTFChars(env, job , cjob);\r
-\r
-       return bOK;\r
-\r
-}\r
-/********************************************************************************************************/\r
-/*! public native void Get(); */\r
-JNIEXPORT void JNICALL Java_javasci_SciComplexArray_Get(JNIEnv *env , jobject obj_this)\r
-/********************************************************************************************************/\r
-{\r
-  int cm,cn,lp;\r
-  const char *cname; \r
-\r
-  /* get the class */\r
-  jclass class_Mine = (*env)->GetObjectClass(env, obj_this);\r
-\r
-  /* get the fields i.e x,m,n,name  */\r
-  jfieldID id_x = (*env)->GetFieldID(env, class_Mine, "x", "[D");\r
-  jfieldID id_y = (*env)->GetFieldID(env, class_Mine, "y", "[D");\r
-\r
-  jfieldID id_name =  (*env)->GetFieldID(env, class_Mine, "name","Ljava/lang/String;");\r
-  jfieldID id_m = (*env)->GetFieldID(env, class_Mine, "m", "I");\r
-  jfieldID id_n = (*env)->GetFieldID(env, class_Mine, "n", "I");\r
-\r
-  /* get the field value */\r
-  jdoubleArray jx = (*env)->GetObjectField(env, obj_this, id_x);\r
-  jdoubleArray jy = (*env)->GetObjectField(env, obj_this, id_y);\r
-\r
-  jstring jname = (jstring) (*env)->GetObjectField(env, obj_this, id_name);\r
-\r
-  jint jm = (*env)->GetIntField(env, obj_this, id_m);\r
-  jint jn = (*env)->GetIntField(env, obj_this, id_n);\r
-\r
-  double *cx = (*env)->GetDoubleArrayElements(env,jx,NULL);\r
-  double *cy = (*env)->GetDoubleArrayElements(env,jy,NULL);\r
-\r
-  cname = (*env)->GetStringUTFChars(env, jname, NULL);\r
-\r
-  cm=jm;cn=jn;\r
-\r
-  if ( ! C2F(cmatcptr)((char *)cname, &cm, &cn, &lp, (unsigned long)strlen(cname))) \r
-  {\r
-         fprintf(stderr,"Error in Java_javasci_SciComplexArray_Get (1).\n");\r
-  }\r
-  else\r
-  {\r
-         double *ComplexArray = NULL;\r
-         int l=0;\r
-         ComplexArray = (double*) MALLOC ( sizeof(double)*(jm*jn*2) );\r
-         if (ComplexArray)\r
-         {\r
-                 if ( ! C2F(creadcmat)((char *)cname, &cm, &cn, ComplexArray,(unsigned long)strlen(cname)) )\r
-                 {\r
-                       fprintf(stderr,"Error in Java_javasci_SciComplexArray_Get (2).\n");\r
-                 }\r
-                 else\r
-                 {\r
-                         for (l=0;l<cm*cn;l++)\r
-                         {\r
-                                 cx[l]=ComplexArray[l];\r
-                         }\r
-\r
-                         for (l=cm*cn;l<cm*cn*2;l++)\r
-                         {\r
-                                 cy[l-cm*cn]=ComplexArray[l];\r
-                         }\r
-                 }\r
-\r
-                 FREE(ComplexArray);\r
-                 ComplexArray=NULL;\r
-         }\r
-         else\r
-         {\r
-                 fprintf(stderr,"Error in Java_javasci_SciComplexArray_Get (3).\n");\r
-         }\r
-  }\r
-       \r
-  (*env)->ReleaseStringUTFChars(env, jname , cname);\r
-  (*env)->ReleaseDoubleArrayElements(env,jx,cx,0);\r
-  (*env)->ReleaseDoubleArrayElements(env,jy,cy,0);\r
-}\r
-/********************************************************************************************************/\r
-/*! public native void Send(); */\r
-JNIEXPORT void JNICALL Java_javasci_SciComplexArray_Send(JNIEnv *env , jobject obj_this)\r
-/********************************************************************************************************/\r
-{\r
-  int cm,cn;\r
-  const char *cname; \r
-  double *ComplexArray = NULL;\r
-\r
-  /* get the class */\r
-  jclass class_Mine = (*env)->GetObjectClass(env, obj_this);\r
-\r
-  /* get the fields i.e x,m,n,name  */\r
-  jfieldID id_x = (*env)->GetFieldID(env, class_Mine, "x", "[D");\r
-  jfieldID id_y = (*env)->GetFieldID(env, class_Mine, "y", "[D");\r
-  jfieldID id_name =  (*env)->GetFieldID(env, class_Mine, "name","Ljava/lang/String;");\r
-  jfieldID id_m = (*env)->GetFieldID(env, class_Mine, "m", "I");\r
-  jfieldID id_n = (*env)->GetFieldID(env, class_Mine, "n", "I");\r
-\r
-  /* get the field value */\r
-  jdoubleArray jx = (*env)->GetObjectField(env, obj_this, id_x);\r
-  jdoubleArray jy = (*env)->GetObjectField(env, obj_this, id_y);\r
-  jstring jname = (jstring) (*env)->GetObjectField(env, obj_this, id_name);\r
-\r
-  jint jm = (*env)->GetIntField(env, obj_this, id_m);\r
-  jint jn = (*env)->GetIntField(env, obj_this, id_n);\r
-  double *cx = (*env)->GetDoubleArrayElements(env,jx,NULL);\r
-  double *cy = (*env)->GetDoubleArrayElements(env,jy,NULL);\r
-  cname = (*env)->GetStringUTFChars(env, jname, NULL);\r
-\r
-  cm=jm;cn=jn;\r
-\r
-  ComplexArray = (double*) MALLOC ( sizeof(double)*(jm*jn*2) );\r
-  if (ComplexArray)\r
-  {\r
-         int l=0;\r
-         for (l=0;l<cm*cn;l++)\r
-         {\r
-                 ComplexArray[l]=cx[l];\r
-         }\r
-\r
-         for (l=cm*cn;l<cm*cn*2;l++)\r
-         {\r
-                 ComplexArray[l]=cy[l-cm*cn];\r
-         }\r
-\r
-         if (!C2F(cwritecmat)((char *)cname,&cm,&cn,ComplexArray,(unsigned long)strlen(cname)))\r
-         {\r
-                 fprintf(stderr,"Error in Java_javasci_SciComplexArray_Send (1).\n");\r
-         }\r
-         FREE(ComplexArray);\r
-         ComplexArray = NULL ;\r
-  }\r
-  else\r
-  {\r
-       fprintf(stderr,"Error in Java_javasci_SciComplexArray_Send (2).\n");\r
-  }\r
-  \r
-  (*env)->ReleaseStringUTFChars(env, jname , cname);\r
-  (*env)->ReleaseDoubleArrayElements(env,jx,cx,0);\r
-  (*env)->ReleaseDoubleArrayElements(env,jy,cy,0);\r
-}\r
-/********************************************************************************************************/\r
-/*! public native double GetRealPartElement(int indr,int indc); */\r
-JNIEXPORT jdouble JNICALL Java_javasci_SciComplexArray_GetRealPartElement(JNIEnv *env , jobject obj_this,jint indrarg, jint indcarg)\r
-{\r
-  int cm,cn,lp;\r
-  const char *cname; \r
-  double Value=0.0;\r
-\r
-  /* get the class */\r
-  jclass class_Mine = (*env)->GetObjectClass(env, obj_this);\r
-\r
-  /* get the fields i.e x,m,n,name  */\r
-  jfieldID id_x = (*env)->GetFieldID(env, class_Mine, "x", "[D");\r
-  jfieldID id_name =  (*env)->GetFieldID(env, class_Mine, "name","Ljava/lang/String;");\r
-  jfieldID id_m = (*env)->GetFieldID(env, class_Mine, "m", "I");\r
-  jfieldID id_n = (*env)->GetFieldID(env, class_Mine, "n", "I");\r
-\r
-  /* get the field value */\r
-  jdoubleArray jx = (*env)->GetObjectField(env, obj_this, id_x);\r
-  jstring jname = (jstring) (*env)->GetObjectField(env, obj_this, id_name);\r
-\r
-  jint jm = (*env)->GetIntField(env, obj_this, id_m);\r
-  jint jn = (*env)->GetIntField(env, obj_this, id_n);\r
-  double *cx = (*env)->GetDoubleArrayElements(env,jx,NULL);\r
-  cname = (*env)->GetStringUTFChars(env, jname, NULL);\r
-\r
-  cm=jm;cn=jn;\r
-\r
-  if ( ! C2F(cmatcptr)((char *)cname, &cm, &cn, &lp, (unsigned long)strlen(cname))) \r
-  {\r
-         fprintf(stderr,"Error in Java_javasci_SciComplexArray_GetRealPartElement (1).\n");\r
-  }\r
-  else\r
-  {\r
-         int l=0;\r
-         double *ComplexArray = NULL;\r
-         ComplexArray = (double*) MALLOC ( sizeof(double)*(jm*jn*2) );\r
-         if (ComplexArray)\r
-         {\r
-                 if ( ! C2F(creadcmat)((char *)cname, &cm, &cn, ComplexArray,(unsigned long)strlen(cname)) )\r
-                 {\r
-                         fprintf(stderr,"Error in Java_javasci_SciComplexArray_GetRealPartElement (2).\n");\r
-                 }\r
-                 else\r
-                 {\r
-                         for (l=0;l<cm*cn;l++)\r
-                         {\r
-                                 cx[l]=ComplexArray[l];\r
-                         }\r
-                 }\r
-\r
-                 FREE(ComplexArray);\r
-                 ComplexArray=NULL;\r
-         }\r
-         else\r
-         {\r
-                 fprintf(stderr,"Error in Java_javasci_SciComplexArray_GetRealPartElement (3).\n");\r
-         }\r
-  }\r
-\r
-  (*env)->ReleaseStringUTFChars(env, jname , cname);\r
-\r
-  if ( (indrarg<=0) || (indcarg<=0) )\r
-  {\r
-       fprintf(stderr,"Error with int indr & int indc must be >0.\n");\r
-       return 0.0;\r
-  }\r
-\r
-  if ( (indrarg>jm) || (indcarg>jn) )\r
-  {\r
-         fprintf(stderr,"Error with int indr & int indc.\n");\r
-         return 0.0;\r
-  }\r
-  Value=cx[(indcarg-1)*cm+(indrarg-1)];\r
-  \r
-  return Value;\r
-}\r
-/********************************************************************************************************/\r
-/*! public native double GetImaginaryPartElement(int indr,int indc); */\r
-JNIEXPORT jdouble JNICALL Java_javasci_SciComplexArray_GetImaginaryPartElement(JNIEnv *env , jobject obj_this,jint indrarg, jint indcarg)\r
-{\r
-  int cm,cn,lp;\r
-  const char *cname; \r
-  double Value=0.0;\r
-\r
-  /* get the class */\r
-  jclass class_Mine = (*env)->GetObjectClass(env, obj_this);\r
-\r
-  /* get the fields i.e x,m,n,name  */\r
-  jfieldID id_y = (*env)->GetFieldID(env, class_Mine, "y", "[D");\r
-  jfieldID id_name =  (*env)->GetFieldID(env, class_Mine, "name","Ljava/lang/String;");\r
-  jfieldID id_m = (*env)->GetFieldID(env, class_Mine, "m", "I");\r
-  jfieldID id_n = (*env)->GetFieldID(env, class_Mine, "n", "I");\r
-\r
-  /* get the field value */\r
-  jdoubleArray jy = (*env)->GetObjectField(env, obj_this, id_y);\r
-  jstring jname = (jstring) (*env)->GetObjectField(env, obj_this, id_name);\r
-\r
-  jint jm = (*env)->GetIntField(env, obj_this, id_m);\r
-  jint jn = (*env)->GetIntField(env, obj_this, id_n);\r
-  double *cy = (*env)->GetDoubleArrayElements(env,jy,NULL);\r
-  cname = (*env)->GetStringUTFChars(env, jname, NULL);\r
-\r
-  cm=jm;cn=jn;\r
-  if ( ! C2F(cmatcptr)((char *)cname, &cm, &cn, &lp, (unsigned long)strlen(cname))) \r
-  {\r
-         fprintf(stderr,"Error in Java_javasci_SciComplexArray_GetImaginaryPartElement (1).\n");\r
-  }\r
-  else\r
-  {\r
-         double *ComplexArray = NULL;\r
-         int l=0;\r
-         ComplexArray = (double*) MALLOC ( sizeof(double)*(jm*jn*2) );\r
-         if (ComplexArray)\r
-         {\r
-                 if ( ! C2F(creadcmat)((char *)cname, &cm, &cn, ComplexArray,(unsigned long)strlen(cname)) )\r
-                 {\r
-                         fprintf(stderr,"Error in Java_javasci_SciComplexArray_GetImaginaryPartElement (2).\n");\r
-                 }\r
-                 else\r
-                 {\r
-                         for (l=cm*cn;l<cm*cn*2;l++)\r
-                         {\r
-                                 cy[l-cm*cn]=ComplexArray[l];\r
-                         }\r
-                 }\r
-\r
-                 FREE(ComplexArray);\r
-                 ComplexArray=NULL;\r
-         }\r
-         else\r
-         {\r
-                 fprintf(stderr,"Error in Java_javasci_SciComplexArray_GetImaginaryPartElement (3).\n");\r
-         }\r
-  }\r
-\r
-  (*env)->ReleaseStringUTFChars(env, jname , cname);\r
-\r
-  if ( (indrarg<=0) || (indcarg<=0) )\r
-  {\r
-       fprintf(stderr,"Error with int indr & int indc must be >0.\n");\r
-       return 0.0;\r
-  }\r
-\r
-  if ( (indrarg>jm) || (indcarg>jn) )\r
-  {\r
-         fprintf(stderr,"Error with int indr & int indc.\n");\r
-         return 0.0;\r
-  }\r
-  \r
-  Value=cy[(indcarg-1)*cm+(indrarg-1)];\r
-  \r
-  return Value;\r
-\r
-}\r
-/********************************************************************************************************/\r
+#include "javasci_SciComplexArray.h"
+/********************************************************************************************************/
+/* Allan CORNET */
+/* INRIA 2006 */
+/********************************************************************************************************/
+/* private static native void Initialize(); */
+JNIEXPORT void JNICALL Java_javasci_SciComplexArray_Initialize (JNIEnv *env, jclass cl)
+{
+       if ( GetInterfState() == 0) { EnableInterf(); Initialize();} 
+}
+/********************************************************************************************************/
+/*! public native boolean Job(String job); */
+JNIEXPORT jboolean JNICALL Java_javasci_SciComplexArray_Job(JNIEnv *env , jobject obj_this, jstring job)
+/********************************************************************************************************/
+{
+       const char *cjob;
+       jboolean bOK=0;
+
+       /* get the class */
+       jclass class_Mine = (*env)->GetObjectClass(env, obj_this);
+
+       /* get the field value */
+       cjob = (*env)->GetStringUTFChars(env, job, NULL);
+
+       if (strlen(cjob) >= MAX_STR)
+       {
+               fprintf(stderr,"Error in Java_javasci_SciComplexArray_Job routine (line too long).\n");
+               bOK=0;
+       }
+       else
+       {
+               if (send_scilab_job((char*)cjob))
+               {
+                       fprintf(stderr,"Error in Java_javasci_SciComplexArray_Job routine.\n");
+                       bOK=0;
+               }
+               else bOK=1;
+       }
+
+       (*env)->ReleaseStringUTFChars(env, job , cjob);
+
+       return bOK;
+
+}
+/********************************************************************************************************/
+/*! public native void Get(); */
+JNIEXPORT void JNICALL Java_javasci_SciComplexArray_Get(JNIEnv *env , jobject obj_this)
+/********************************************************************************************************/
+{
+  int cm,cn,lp;
+  const char *cname; 
+
+  /* get the class */
+  jclass class_Mine = (*env)->GetObjectClass(env, obj_this);
+
+  /* get the fields i.e x,m,n,name  */
+  jfieldID id_x = (*env)->GetFieldID(env, class_Mine, "x", "[D");
+  jfieldID id_y = (*env)->GetFieldID(env, class_Mine, "y", "[D");
+
+  jfieldID id_name =  (*env)->GetFieldID(env, class_Mine, "name","Ljava/lang/String;");
+  jfieldID id_m = (*env)->GetFieldID(env, class_Mine, "m", "I");
+  jfieldID id_n = (*env)->GetFieldID(env, class_Mine, "n", "I");
+
+  /* get the field value */
+  jdoubleArray jx = (*env)->GetObjectField(env, obj_this, id_x);
+  jdoubleArray jy = (*env)->GetObjectField(env, obj_this, id_y);
+
+  jstring jname = (jstring) (*env)->GetObjectField(env, obj_this, id_name);
+
+  jint jm = (*env)->GetIntField(env, obj_this, id_m);
+  jint jn = (*env)->GetIntField(env, obj_this, id_n);
+
+  double *cx = (*env)->GetDoubleArrayElements(env,jx,NULL);
+  double *cy = (*env)->GetDoubleArrayElements(env,jy,NULL);
+
+  cname = (*env)->GetStringUTFChars(env, jname, NULL);
+
+  cm=jm;cn=jn;
+
+  if ( ! C2F(cmatcptr)((char *)cname, &cm, &cn, &lp, (unsigned long)strlen(cname))) 
+  {
+         fprintf(stderr,"Error in Java_javasci_SciComplexArray_Get (1).\n");
+  }
+  else
+  {
+         double *ComplexArray = NULL;
+         int l=0;
+         ComplexArray = (double*) MALLOC ( sizeof(double)*(jm*jn*2) );
+         if (ComplexArray)
+         {
+                 if ( ! C2F(creadcmat)((char *)cname, &cm, &cn, ComplexArray,(unsigned long)strlen(cname)) )
+                 {
+                       fprintf(stderr,"Error in Java_javasci_SciComplexArray_Get (2).\n");
+                 }
+                 else
+                 {
+                         for (l=0;l<cm*cn;l++)
+                         {
+                                 cx[l]=ComplexArray[l];
+                         }
+
+                         for (l=cm*cn;l<cm*cn*2;l++)
+                         {
+                                 cy[l-cm*cn]=ComplexArray[l];
+                         }
+                 }
+
+                 FREE(ComplexArray);
+                 ComplexArray=NULL;
+         }
+         else
+         {
+                 fprintf(stderr,"Error in Java_javasci_SciComplexArray_Get (3).\n");
+         }
+  }
+       
+  (*env)->ReleaseStringUTFChars(env, jname , cname);
+  (*env)->ReleaseDoubleArrayElements(env,jx,cx,0);
+  (*env)->ReleaseDoubleArrayElements(env,jy,cy,0);
+}
+/********************************************************************************************************/
+/*! public native void Send(); */
+JNIEXPORT void JNICALL Java_javasci_SciComplexArray_Send(JNIEnv *env , jobject obj_this)
+/********************************************************************************************************/
+{
+  int cm,cn;
+  const char *cname; 
+  double *ComplexArray = NULL;
+
+  /* get the class */
+  jclass class_Mine = (*env)->GetObjectClass(env, obj_this);
+
+  /* get the fields i.e x,m,n,name  */
+  jfieldID id_x = (*env)->GetFieldID(env, class_Mine, "x", "[D");
+  jfieldID id_y = (*env)->GetFieldID(env, class_Mine, "y", "[D");
+  jfieldID id_name =  (*env)->GetFieldID(env, class_Mine, "name","Ljava/lang/String;");
+  jfieldID id_m = (*env)->GetFieldID(env, class_Mine, "m", "I");
+  jfieldID id_n = (*env)->GetFieldID(env, class_Mine, "n", "I");
+
+  /* get the field value */
+  jdoubleArray jx = (*env)->GetObjectField(env, obj_this, id_x);
+  jdoubleArray jy = (*env)->GetObjectField(env, obj_this, id_y);
+  jstring jname = (jstring) (*env)->GetObjectField(env, obj_this, id_name);
+
+  jint jm = (*env)->GetIntField(env, obj_this, id_m);
+  jint jn = (*env)->GetIntField(env, obj_this, id_n);
+  double *cx = (*env)->GetDoubleArrayElements(env,jx,NULL);
+  double *cy = (*env)->GetDoubleArrayElements(env,jy,NULL);
+  cname = (*env)->GetStringUTFChars(env, jname, NULL);
+
+  cm=jm;cn=jn;
+
+  ComplexArray = (double*) MALLOC ( sizeof(double)*(jm*jn*2) );
+  if (ComplexArray)
+  {
+         int l=0;
+         for (l=0;l<cm*cn;l++)
+         {
+                 ComplexArray[l]=cx[l];
+         }
+
+         for (l=cm*cn;l<cm*cn*2;l++)
+         {
+                 ComplexArray[l]=cy[l-cm*cn];
+         }
+
+         if (!C2F(cwritecmat)((char *)cname,&cm,&cn,ComplexArray,(unsigned long)strlen(cname)))
+         {
+                 fprintf(stderr,"Error in Java_javasci_SciComplexArray_Send (1).\n");
+         }
+         FREE(ComplexArray);
+         ComplexArray = NULL ;
+  }
+  else
+  {
+       fprintf(stderr,"Error in Java_javasci_SciComplexArray_Send (2).\n");
+  }
+  
+  (*env)->ReleaseStringUTFChars(env, jname , cname);
+  (*env)->ReleaseDoubleArrayElements(env,jx,cx,0);
+  (*env)->ReleaseDoubleArrayElements(env,jy,cy,0);
+}
+/********************************************************************************************************/
+/*! public native double GetRealPartElement(int indr,int indc); */
+JNIEXPORT jdouble JNICALL Java_javasci_SciComplexArray_GetRealPartElement(JNIEnv *env , jobject obj_this,jint indrarg, jint indcarg)
+{
+  int cm,cn,lp;
+  const char *cname; 
+  double Value=0.0;
+
+  /* get the class */
+  jclass class_Mine = (*env)->GetObjectClass(env, obj_this);
+
+  /* get the fields i.e x,m,n,name  */
+  jfieldID id_x = (*env)->GetFieldID(env, class_Mine, "x", "[D");
+  jfieldID id_name =  (*env)->GetFieldID(env, class_Mine, "name","Ljava/lang/String;");
+  jfieldID id_m = (*env)->GetFieldID(env, class_Mine, "m", "I");
+  jfieldID id_n = (*env)->GetFieldID(env, class_Mine, "n", "I");
+
+  /* get the field value */
+  jdoubleArray jx = (*env)->GetObjectField(env, obj_this, id_x);
+  jstring jname = (jstring) (*env)->GetObjectField(env, obj_this, id_name);
+
+  jint jm = (*env)->GetIntField(env, obj_this, id_m);
+  jint jn = (*env)->GetIntField(env, obj_this, id_n);
+  double *cx = (*env)->GetDoubleArrayElements(env,jx,NULL);
+  cname = (*env)->GetStringUTFChars(env, jname, NULL);
+
+  cm=jm;cn=jn;
+
+  if ( ! C2F(cmatcptr)((char *)cname, &cm, &cn, &lp, (unsigned long)strlen(cname))) 
+  {
+         fprintf(stderr,"Error in Java_javasci_SciComplexArray_GetRealPartElement (1).\n");
+  }
+  else
+  {
+         int l=0;
+         double *ComplexArray = NULL;
+         ComplexArray = (double*) MALLOC ( sizeof(double)*(jm*jn*2) );
+         if (ComplexArray)
+         {
+                 if ( ! C2F(creadcmat)((char *)cname, &cm, &cn, ComplexArray,(unsigned long)strlen(cname)) )
+                 {
+                         fprintf(stderr,"Error in Java_javasci_SciComplexArray_GetRealPartElement (2).\n");
+                 }
+                 else
+                 {
+                         for (l=0;l<cm*cn;l++)
+                         {
+                                 cx[l]=ComplexArray[l];
+                         }
+                 }
+
+                 FREE(ComplexArray);
+                 ComplexArray=NULL;
+         }
+         else
+         {
+                 fprintf(stderr,"Error in Java_javasci_SciComplexArray_GetRealPartElement (3).\n");
+         }
+  }
+
+  (*env)->ReleaseStringUTFChars(env, jname , cname);
+
+  if ( (indrarg<=0) || (indcarg<=0) )
+  {
+       fprintf(stderr,"Error with int indr & int indc must be >0.\n");
+       return 0.0;
+  }
+
+  if ( (indrarg>jm) || (indcarg>jn) )
+  {
+         fprintf(stderr,"Error with int indr & int indc.\n");
+         return 0.0;
+  }
+  Value=cx[(indcarg-1)*cm+(indrarg-1)];
+  
+  return Value;
+}
+/********************************************************************************************************/
+/*! public native double GetImaginaryPartElement(int indr,int indc); */
+JNIEXPORT jdouble JNICALL Java_javasci_SciComplexArray_GetImaginaryPartElement(JNIEnv *env , jobject obj_this,jint indrarg, jint indcarg)
+{
+  int cm,cn,lp;
+  const char *cname; 
+  double Value=0.0;
+
+  /* get the class */
+  jclass class_Mine = (*env)->GetObjectClass(env, obj_this);
+
+  /* get the fields i.e x,m,n,name  */
+  jfieldID id_y = (*env)->GetFieldID(env, class_Mine, "y", "[D");
+  jfieldID id_name =  (*env)->GetFieldID(env, class_Mine, "name","Ljava/lang/String;");
+  jfieldID id_m = (*env)->GetFieldID(env, class_Mine, "m", "I");
+  jfieldID id_n = (*env)->GetFieldID(env, class_Mine, "n", "I");
+
+  /* get the field value */
+  jdoubleArray jy = (*env)->GetObjectField(env, obj_this, id_y);
+  jstring jname = (jstring) (*env)->GetObjectField(env, obj_this, id_name);
+
+  jint jm = (*env)->GetIntField(env, obj_this, id_m);
+  jint jn = (*env)->GetIntField(env, obj_this, id_n);
+  double *cy = (*env)->GetDoubleArrayElements(env,jy,NULL);
+  cname = (*env)->GetStringUTFChars(env, jname, NULL);
+
+  cm=jm;cn=jn;
+  if ( ! C2F(cmatcptr)((char *)cname, &cm, &cn, &lp, (unsigned long)strlen(cname))) 
+  {
+         fprintf(stderr,"Error in Java_javasci_SciComplexArray_GetImaginaryPartElement (1).\n");
+  }
+  else
+  {
+         double *ComplexArray = NULL;
+         int l=0;
+         ComplexArray = (double*) MALLOC ( sizeof(double)*(jm*jn*2) );
+         if (ComplexArray)
+         {
+                 if ( ! C2F(creadcmat)((char *)cname, &cm, &cn, ComplexArray,(unsigned long)strlen(cname)) )
+                 {
+                         fprintf(stderr,"Error in Java_javasci_SciComplexArray_GetImaginaryPartElement (2).\n");
+                 }
+                 else
+                 {
+                         for (l=cm*cn;l<cm*cn*2;l++)
+                         {
+                                 cy[l-cm*cn]=ComplexArray[l];
+                         }
+                 }
+
+                 FREE(ComplexArray);
+                 ComplexArray=NULL;
+         }
+         else
+         {
+                 fprintf(stderr,"Error in Java_javasci_SciComplexArray_GetImaginaryPartElement (3).\n");
+         }
+  }
+
+  (*env)->ReleaseStringUTFChars(env, jname , cname);
+
+  if ( (indrarg<=0) || (indcarg<=0) )
+  {
+       fprintf(stderr,"Error with int indr & int indc must be >0.\n");
+       return 0.0;
+  }
+
+  if ( (indrarg>jm) || (indcarg>jn) )
+  {
+         fprintf(stderr,"Error with int indr & int indc.\n");
+         return 0.0;
+  }
+  
+  Value=cy[(indcarg-1)*cm+(indrarg-1)];
+  
+  return Value;
+
+}
+/********************************************************************************************************/
index 1775b79..e936be8 100644 (file)
-#include "javasci_Scilab.h"\r
-/********************************************************************************************************/\r
-/* Allan CORNET */\r
-/* INRIA */\r
-/********************************************************************************************************/\r
-JNIEXPORT void JNICALL Java_javasci_Scilab_Initialize (JNIEnv *env, jclass cl)\r
-{\r
-       if ( GetInterfState() == 0) { EnableInterf(); Initialize();} \r
-}\r
-/********************************************************************************************************/\r
-/* public static native void Events(); */\r
-JNIEXPORT void JNICALL Java_javasci_Scilab_Events(JNIEnv *env , jobject obj_this)\r
-/********************************************************************************************************/\r
-{\r
-       ScilabDoOneEvent();\r
-}\r
-/********************************************************************************************************/\r
-/* public static native boolean HaveAGraph(); */\r
-JNIEXPORT jboolean JNICALL Java_javasci_Scilab_HaveAGraph (JNIEnv *env , jobject obj_this)\r
-/********************************************************************************************************/\r
-{\r
-       integer iflag =0,ids,num;\r
-       jboolean bOK=0;\r
-\r
-       if (version_flag() == 0)\r
-       {\r
-               sciGetIdFigure (&ids,&num,&iflag);\r
-               if (num > 0) bOK=1;\r
-               \r
-       }/* NG end*/\r
-       else\r
-       {\r
-               C2F(getwins)(&num,&ids ,&iflag);\r
-               if (num > 0) bOK=1;\r
-  } \r
\r
-       return bOK;\r
-}\r
-/********************************************************************************************************/\r
-/* public static native boolean Exec(String job); */\r
-JNIEXPORT jboolean JNICALL Java_javasci_Scilab_Exec(JNIEnv *env , jclass cl, jstring job)\r
-/********************************************************************************************************/\r
-{\r
-  jboolean bOK=0;\r
-  const char *cjob;\r
-\r
-  cjob = (*env)->GetStringUTFChars(env, job, NULL);\r
-\r
-  if (strlen(cjob) >= MAX_STR)\r
-  {\r
-         fprintf(stderr,"Error in Java_javasci_Scilab_Exec routine (line too long).\n");\r
-         bOK=0;\r
-  }\r
-  else\r
-  {\r
-         if ( send_scilab_job((char *)cjob) != 0) \r
-         {\r
-                 fprintf(stderr,"Error in Java_javasci_Scilab_Exec routine.\n");\r
-                 bOK=0;\r
-         }\r
-         else bOK=1;\r
-  }\r
-\r
-  (*env)->ReleaseStringUTFChars(env, job , cjob);\r
-\r
-  return bOK;\r
-}\r
-/********************************************************************************************************/\r
-/* public static native boolean Finish(); */\r
-JNIEXPORT jboolean JNICALL Java_javasci_Scilab_Finish (JNIEnv *env , jobject obj_this)\r
-{\r
-       jboolean bOK=0;\r
-\r
-       if (GetInterfState() == 0)\r
-       {\r
-               bOK=0;\r
-       }\r
-       else\r
-       {\r
-               ExitScilab();\r
-               bOK=1;\r
-       }\r
-       return bOK;\r
-}\r
-/********************************************************************************************************/\r
-/* public static native boolean ExistVar(String VarName); */\r
-JNIEXPORT jboolean JNICALL Java_javasci_Scilab_ExistVar(JNIEnv *env , jclass cl, jstring VarName)\r
-{\r
-  jboolean bOK=0;\r
-  const char *cVarName;\r
-\r
-  cVarName = (*env)->GetStringUTFChars(env, VarName, NULL);\r
-\r
-  if (strlen(cVarName) >= MAX_STR)\r
-  {\r
-         fprintf(stderr,"Error in Java_javasci_Scilab_ExistVar routine (line too long).\n");\r
-         bOK=0;\r
-  }\r
-  else\r
-  {\r
-         int lw; int fin;\r
-         \r
-         if (C2F(objptr)((char*)cVarName,&lw,&fin,(unsigned long)strlen(cVarName)))\r
-         {\r
-                 bOK=1;\r
-         }\r
-         else\r
-         {\r
-                 bOK=0;\r
-         }\r
-  }\r
-\r
-  (*env)->ReleaseStringUTFChars(env, VarName , cVarName);\r
-\r
-  return bOK;\r
-}\r
-/********************************************************************************************************/\r
-/* public static native int TypeVar(String VarName); */\r
-JNIEXPORT jint JNICALL Java_javasci_Scilab_TypeVar(JNIEnv *env , jclass cl, jstring VarName)\r
-{\r
-  jint type=-1;\r
-  const char *cVarName;\r
-\r
-  cVarName = (*env)->GetStringUTFChars(env, VarName, NULL);\r
-\r
-  if (strlen(cVarName) >= MAX_STR)\r
-  {\r
-         fprintf(stderr,"Error in Java_javasci_Scilab_ExistVar routine (line too long).\n");\r
-         type=-1;\r
-  }\r
-  else\r
-  {\r
-         int lw; int fin;\r
-         \r
-         if (C2F(objptr)((char*)cVarName,&lw,&fin,(unsigned long)strlen(cVarName)))\r
-         {\r
-                 int *header=NULL; \r
-                 header = (int *)GetDataFromName((char *)cVarName);\r
-                 type = header[0];\r
-         }\r
-         else\r
-         {\r
-                 type =-1;\r
-                 \r
-         }\r
-  }\r
-\r
-  (*env)->ReleaseStringUTFChars(env, VarName , cVarName);\r
-\r
-  return type;\r
-}\r
-/********************************************************************************************************/\r
-/* public static native int GetLastErrorCode(); */\r
-JNIEXPORT jint JNICALL Java_javasci_Scilab_GetLastErrorCode (JNIEnv *env , jobject obj_this)\r
-{\r
-       jint ErrorCode=0;\r
-\r
-       ErrorCode=GetLastErrorCode();\r
-\r
-       return ErrorCode;\r
-}\r
-/********************************************************************************************************/\r
+#include "javasci_Scilab.h"
+/********************************************************************************************************/
+/* Allan CORNET */
+/* INRIA */
+/********************************************************************************************************/
+JNIEXPORT void JNICALL Java_javasci_Scilab_Initialize (JNIEnv *env, jclass cl)
+{
+       if ( GetInterfState() == 0) { EnableInterf(); Initialize();} 
+}
+/********************************************************************************************************/
+/* public static native void Events(); */
+JNIEXPORT void JNICALL Java_javasci_Scilab_Events(JNIEnv *env , jobject obj_this)
+/********************************************************************************************************/
+{
+       ScilabDoOneEvent();
+}
+/********************************************************************************************************/
+/* public static native boolean HaveAGraph(); */
+JNIEXPORT jboolean JNICALL Java_javasci_Scilab_HaveAGraph (JNIEnv *env , jobject obj_this)
+/********************************************************************************************************/
+{
+       integer iflag =0,ids,num;
+       jboolean bOK=0;
+
+       if (version_flag() == 0)
+       {
+               sciGetIdFigure (&ids,&num,&iflag);
+               if (num > 0) bOK=1;
+               
+       }/* NG end*/
+       else
+       {
+               C2F(getwins)(&num,&ids ,&iflag);
+               if (num > 0) bOK=1;
+  } 
+       return bOK;
+}
+/********************************************************************************************************/
+/* public static native boolean Exec(String job); */
+JNIEXPORT jboolean JNICALL Java_javasci_Scilab_Exec(JNIEnv *env , jclass cl, jstring job)
+/********************************************************************************************************/
+{
+  jboolean bOK=0;
+  const char *cjob;
+
+  cjob = (*env)->GetStringUTFChars(env, job, NULL);
+
+  if (strlen(cjob) >= MAX_STR)
+  {
+         fprintf(stderr,"Error in Java_javasci_Scilab_Exec routine (line too long).\n");
+         bOK=0;
+  }
+  else
+  {
+         if ( send_scilab_job((char *)cjob) != 0) 
+         {
+                 fprintf(stderr,"Error in Java_javasci_Scilab_Exec routine.\n");
+                 bOK=0;
+         }
+         else bOK=1;
+  }
+
+  (*env)->ReleaseStringUTFChars(env, job , cjob);
+
+  return bOK;
+}
+/********************************************************************************************************/
+/* public static native boolean Finish(); */
+JNIEXPORT jboolean JNICALL Java_javasci_Scilab_Finish (JNIEnv *env , jobject obj_this)
+{
+       jboolean bOK=0;
+
+       if (GetInterfState() == 0)
+       {
+               bOK=0;
+       }
+       else
+       {
+               ExitScilab();
+               bOK=1;
+       }
+       return bOK;
+}
+/********************************************************************************************************/
+/* public static native boolean ExistVar(String VarName); */
+JNIEXPORT jboolean JNICALL Java_javasci_Scilab_ExistVar(JNIEnv *env , jclass cl, jstring VarName)
+{
+  jboolean bOK=0;
+  const char *cVarName;
+
+  cVarName = (*env)->GetStringUTFChars(env, VarName, NULL);
+
+  if (strlen(cVarName) >= MAX_STR)
+  {
+         fprintf(stderr,"Error in Java_javasci_Scilab_ExistVar routine (line too long).\n");
+         bOK=0;
+  }
+  else
+  {
+         int lw; int fin;
+         
+         if (C2F(objptr)((char*)cVarName,&lw,&fin,(unsigned long)strlen(cVarName)))
+         {
+                 bOK=1;
+         }
+         else
+         {
+                 bOK=0;
+         }
+  }
+
+  (*env)->ReleaseStringUTFChars(env, VarName , cVarName);
+
+  return bOK;
+}
+/********************************************************************************************************/
+/* public static native int TypeVar(String VarName); */
+JNIEXPORT jint JNICALL Java_javasci_Scilab_TypeVar(JNIEnv *env , jclass cl, jstring VarName)
+{
+  jint type=-1;
+  const char *cVarName;
+
+  cVarName = (*env)->GetStringUTFChars(env, VarName, NULL);
+
+  if (strlen(cVarName) >= MAX_STR)
+  {
+         fprintf(stderr,"Error in Java_javasci_Scilab_ExistVar routine (line too long).\n");
+         type=-1;
+  }
+  else
+  {
+         int lw; int fin;
+         
+         if (C2F(objptr)((char*)cVarName,&lw,&fin,(unsigned long)strlen(cVarName)))
+         {
+                 int *header=NULL; 
+                 header = (int *)GetDataFromName((char *)cVarName);
+                 type = header[0];
+         }
+         else
+         {
+                 type =-1;
+                 
+         }
+  }
+
+  (*env)->ReleaseStringUTFChars(env, VarName , cVarName);
+
+  return type;
+}
+/********************************************************************************************************/
+/* public static native int GetLastErrorCode(); */
+JNIEXPORT jint JNICALL Java_javasci_Scilab_GetLastErrorCode (JNIEnv *env , jobject obj_this)
+{
+       jint ErrorCode=0;
+
+       ErrorCode=GetLastErrorCode();
+
+       return ErrorCode;
+}
+/********************************************************************************************************/
index 4199c39..bde9b6d 100644 (file)
-/********************************************************************************************************/\r
-/* Arnaud Mangin */\r
-/* INRIA 2006 */\r
-/********************************************************************************************************/\r
-#include "javasci_Scilab2.h"\r
-/********************************************************************************************************/\r
-/**\r
-* Add on  : Javasci for Pro-Active \r
-*/\r
-/********************************************************************************************************/\r
-#define MAX_String 1024\r
-/********************************************************************************************************/\r
-JNIEXPORT void JNICALL Java_javasci_Scilab_initialize(JNIEnv *env, jclass cl)\r
-{\r
-       if ( GetInterfState() == 0) { EnableInterf(); Initialize();} \r
-}\r
-/********************************************************************************************************/\r
-JNIEXPORT void JNICALL Java_javasci_Scilab_sendDoubleMatrix (JNIEnv *env, jclass cl, jobject objMatrix)\r
-{\r
-  const char *cname;\r
-  double *matrix;\r
-  int nbRow, nbCol;\r
-  \r
-  jclass clMatrix = (*env)->GetObjectClass(env, objMatrix);\r
-  \r
-  jfieldID id_matrix =  (*env)->GetFieldID(env, clMatrix, "matrix", "[D" );\r
-  jfieldID id_name =  (*env)->GetFieldID(env, clMatrix, "name", "Ljava/lang/String;");\r
-  jfieldID id_nbRow =  (*env)->GetFieldID(env, clMatrix, "nbRow", "I" );\r
-  jfieldID id_nbCol =  (*env)->GetFieldID(env, clMatrix, "nbCol", "I" );\r
-  \r
-  jdoubleArray jmatrix = (*env)->GetObjectField(env, objMatrix, id_matrix);\r
-  jstring jname = (jstring) (*env)->GetObjectField(env, objMatrix, id_name);\r
-  jint jnbRow = (*env)->GetIntField(env, objMatrix, id_nbRow);\r
-  jint jnbCol = (*env)->GetIntField(env, objMatrix, id_nbCol);\r
-  \r
-  nbRow = jnbRow;\r
-  nbCol = jnbCol;\r
-\r
-  cname = (*env)->GetStringUTFChars(env, jname, NULL); \r
-  matrix = (*env)->GetDoubleArrayElements(env, jmatrix, NULL);\r
-  \r
-  if (! C2F(cwritemat)((char *)cname, &nbRow , &nbCol, matrix, (unsigned long)strlen(cname)))\r
-  {\r
-    /* throws exceptions */\r
-  }\r
-                                                                       \r
-  (*env)->ReleaseStringUTFChars(env, jname , cname);\r
-  (*env)->ReleaseDoubleArrayElements(env, jmatrix, matrix, 0);\r
-}\r
-/********************************************************************************************************/\r
-JNIEXPORT void JNICALL Java_javasci_Scilab_receiveDoubleMatrix (JNIEnv *env, jclass cl, jobject objMatrix)\r
-{\r
-  const char *cname=NULL;\r
-  double *matrix=NULL, *tmp=NULL;\r
-  int nbRow, nbCol;\r
-  int i, j;\r
-  \r
-  jclass clMatrix = (*env)->GetObjectClass(env, objMatrix);\r
-  \r
-  jfieldID id_matrix =  (*env)->GetFieldID(env, clMatrix, "matrix", "[D" );\r
-  jfieldID id_name =  (*env)->GetFieldID(env, clMatrix, "name", "Ljava/lang/String;");\r
-  jfieldID id_nbRow =  (*env)->GetFieldID(env, clMatrix, "nbRow", "I" );\r
-  jfieldID id_nbCol =  (*env)->GetFieldID(env, clMatrix, "nbCol", "I" );\r
-  \r
-  jdoubleArray jmatrix = (*env)->GetObjectField(env, objMatrix, id_matrix);\r
-  jstring jname = (jstring) (*env)->GetObjectField(env, objMatrix, id_name);\r
-  jint jnbRow = (*env)->GetIntField(env, objMatrix, id_nbRow);\r
-  jint jnbCol = (*env)->GetIntField(env, objMatrix, id_nbCol);\r
-  \r
-  nbRow = jnbRow;\r
-  nbCol = jnbCol;\r
-\r
-  cname = (*env)->GetStringUTFChars(env, jname, NULL); \r
-  matrix = (*env)->GetDoubleArrayElements(env, jmatrix, NULL);\r
-  \r
-  tmp = (double * ) MALLOC(nbRow * nbCol * sizeof(double));\r
-  if (! C2F(creadmat)((char *)cname, &nbRow , &nbCol, tmp, (unsigned long)strlen(cname) ))\r
-  {\r
-     /* throws exceptions */\r
-  }\r
-\r
-  for(i=0; i<nbRow; i++)\r
-  {\r
-    for(j=0; j<nbCol; j++)\r
-       {\r
-      matrix[i*nbCol+j] = tmp[j*nbRow+i];\r
-    }\r
-  }\r
-                                                       \r
-  FREE(tmp);\r
-  (*env)->ReleaseStringUTFChars(env, jname , cname);\r
-  (*env)->ReleaseDoubleArrayElements(env, jmatrix, matrix, 0);\r
-}\r
-/********************************************************************************************************/\r
-jobject getDoubleMatrix(JNIEnv *env,  jclass cl, jstring name, jint nbRow, jint nbCol)\r
-{\r
-  jclass clMatrix = (*env)->FindClass(env, "javasci/SciDoubleMatrix");\r
-  jmethodID consID = (*env)->GetMethodID(env, clMatrix, "<init>", "(Ljava/lang/String;II)V"); \r
-  jobject objMatrix =  (*env)->NewObject(env, clMatrix, consID, name, nbRow, nbCol);\r
-  \r
-  Java_javasci_Scilab_receiveDoubleMatrix(env, cl, objMatrix);\r
-  return objMatrix;\r
-}\r
-/********************************************************************************************************/\r
-JNIEXPORT void JNICALL Java_javasci_Scilab_sendStringMatrix (JNIEnv *env, jclass cl, jobject objMatrix)\r
-{\r
-  #define MAX_String 1024\r
-  const char *cname;\r
-  int nbRow, nbCol;\r
-  int i, j, max=MAX_String;\r
-  jstring jelement;\r
-  const char *element;\r
-  char job[MAX_String*4];\r
-  \r
-  jclass clMatrix = (*env)->GetObjectClass(env, objMatrix);\r
-  \r
-  jfieldID id_matrix = (*env)->GetFieldID(env, clMatrix, "matrix", "[Ljava/lang/String;" );\r
-  jfieldID id_name =  (*env)->GetFieldID(env, clMatrix, "name", "Ljava/lang/String;");\r
-  jfieldID id_nbRow = (*env)->GetFieldID(env, clMatrix, "nbRow", "I" );\r
-  jfieldID id_nbCol = (*env)->GetFieldID(env, clMatrix, "nbCol", "I" );\r
-  \r
\r
-  jobjectArray jmatrix = (*env)->GetObjectField(env, objMatrix, id_matrix);\r
-  jstring jname = (jstring) (*env)->GetObjectField(env, objMatrix, id_name);\r
-  jint jnbRow = (*env)->GetIntField(env, objMatrix, id_nbRow);\r
-  jint jnbCol = (*env)->GetIntField(env, objMatrix, id_nbCol);\r
-  \r
-  nbRow = jnbRow;\r
-  nbCol = jnbCol;\r
-\r
-  cname = (*env)->GetStringUTFChars(env, jname, NULL);\r
-   \r
-  for(i=0; i<nbRow; i++)\r
-  {\r
-    for(j=0; j<nbCol; j++)\r
-       {\r
-      jelement = (jstring)(*env)->GetObjectArrayElement(env, jmatrix, i*nbCol + j);\r
-      element = (*env)->GetStringUTFChars(env, jelement, NULL);\r
-      \r
-      sprintf(job,"%s(%d,%d)=\"\"%s\"\";",cname,i+1,j+1,element);\r
-      \r
-      if (send_scilab_job(job))\r
-         {\r
-               /* throws exceptions */\r
-      }\r
-      \r
-      (*env)->ReleaseStringUTFChars(env, jelement,  element);\r
-    }\r
-  }\r
-\r
-  (*env)->ReleaseStringUTFChars(env, jname , cname);\r
-}\r
-/********************************************************************************************************/\r
-JNIEXPORT void JNICALL Java_javasci_Scilab_receiveStringMatrix (JNIEnv *env, jclass cl, jobject objMatrix)\r
-{\r
-  const char *cname;\r
-  int nbRow, nbCol;\r
-  int i, j,  r, c, l, max=MAX_String;\r
-  char *element = (char *) MALLOC(sizeof(char) * max);\r
-  \r
-  jclass clMatrix = (*env)->GetObjectClass(env, objMatrix);\r
-  \r
-  jfieldID id_matrix =  (*env)->GetFieldID(env, clMatrix, "matrix", "[Ljava/lang/String;" );\r
-  jfieldID id_name =  (*env)->GetFieldID(env, clMatrix, "name", "Ljava/lang/String;");\r
-  jfieldID id_nbRow =  (*env)->GetFieldID(env, clMatrix, "nbRow", "I" );\r
-  jfieldID id_nbCol =  (*env)->GetFieldID(env, clMatrix, "nbCol", "I" );\r
-  \r
-  jobjectArray jmatrix = (*env)->GetObjectField(env, objMatrix, id_matrix);\r
-  jstring jname = (jstring) (*env)->GetObjectField(env, objMatrix, id_name);\r
-  jint jnbRow = (*env)->GetIntField(env, objMatrix, id_nbRow);\r
-  jint jnbCol = (*env)->GetIntField(env, objMatrix, id_nbCol);\r
-\r
-  jstring jelement; \r
-  \r
-  nbRow = jnbRow;\r
-  nbCol = jnbCol;\r
-\r
-  cname = (*env)->GetStringUTFChars(env, jname, NULL);\r
-   \r
-  for(i=0; i<nbRow; i++)\r
-  {\r
-    for(j=0; j<nbCol; j++)\r
-       {\r
-      r = i+1;\r
-      c = j+1;\r
-      l = max;\r
-      \r
-      if (!C2F(creadchains)((char *)cname, &r, &c, &l, element, (unsigned long)strlen(cname), (unsigned long)strlen(element)))\r
-         {\r
-               /* throws exceptions */\r
-      }\r
-\r
-      jelement = (*env)->NewStringUTF(env, element);\r
-      (*env)->SetObjectArrayElement(env, jmatrix,  i*nbCol + j, jelement);\r
-    }\r
-  }\r
-  \r
-  FREE(element);\r
-  (*env)->ReleaseStringUTFChars(env, jname , cname);\r
-}\r
-/********************************************************************************************************/\r
-jobject getStringMatrix(JNIEnv *env,  jclass cl, jstring name, jint nbRow, jint nbCol)\r
-{\r
-  jclass clMatrix = (*env)->FindClass(env, "javasci/SciStringMatrix");\r
-  jmethodID consID = (*env)->GetMethodID(env, clMatrix, "<init>", "(Ljava/lang/String;II)V"); \r
-  jobject objMatrix =  (*env)->NewObject(env, clMatrix, consID, name, nbRow, nbCol);\r
-  \r
-  Java_javasci_Scilab_receiveStringMatrix(env, cl, objMatrix);\r
-  return objMatrix;\r
-}\r
-/********************************************************************************************************/\r
-JNIEXPORT jobject JNICALL Java_javasci_Scilab_receiveDataByName (JNIEnv *env, jclass cl, jstring name)\r
-{\r
-  const char *cname;\r
-  int *header; \r
-  jobject obj=NULL;\r
-  int type = 0;\r
-\r
-  cname = (*env)->GetStringUTFChars(env, name, NULL); \r
-\r
-  if((header = (int *)GetDataFromName((char *)cname)) == NULL)\r
-  {\r
-    /* throws exception */\r
-  }\r
-\r
-  (*env)->ReleaseStringUTFChars(env, name , cname);\r
-  \r
-  type = header[0]; /* give type */\r
-\r
-  switch(type)\r
-  {\r
-  case sci_matrix : \r
-    return getDoubleMatrix(env, cl, name, header[1], header[2]);\r
-  case sci_poly :\r
-    break;\r
-  case sci_boolean :\r
-    break;\r
-  case sci_ints :\r
-    break; \r
-  case sci_strings :\r
-     return getStringMatrix(env, cl, name, header[1], header[2]);\r
-    break;\r
-  case sci_list :\r
-    break;\r
-  default :\r
-    break;\r
-  }\r
-  return obj;\r
-}\r
-/********************************************************************************************************/\r
+/********************************************************************************************************/
+/* Arnaud Mangin */
+/* INRIA 2006 */
+/********************************************************************************************************/
+#include "javasci_Scilab2.h"
+/********************************************************************************************************/
+/**
+* Add on  : Javasci for Pro-Active 
+*/
+/********************************************************************************************************/
+#define MAX_String 1024
+/********************************************************************************************************/
+JNIEXPORT void JNICALL Java_javasci_Scilab_initialize(JNIEnv *env, jclass cl)
+{
+       if ( GetInterfState() == 0) { EnableInterf(); Initialize();} 
+}
+/********************************************************************************************************/
+JNIEXPORT void JNICALL Java_javasci_Scilab_sendDoubleMatrix (JNIEnv *env, jclass cl, jobject objMatrix)
+{
+  const char *cname;
+  double *matrix;
+  int nbRow, nbCol;
+  
+  jclass clMatrix = (*env)->GetObjectClass(env, objMatrix);
+  
+  jfieldID id_matrix =  (*env)->GetFieldID(env, clMatrix, "matrix", "[D" );
+  jfieldID id_name =  (*env)->GetFieldID(env, clMatrix, "name", "Ljava/lang/String;");
+  jfieldID id_nbRow =  (*env)->GetFieldID(env, clMatrix, "nbRow", "I" );
+  jfieldID id_nbCol =  (*env)->GetFieldID(env, clMatrix, "nbCol", "I" );
+  
+  jdoubleArray jmatrix = (*env)->GetObjectField(env, objMatrix, id_matrix);
+  jstring jname = (jstring) (*env)->GetObjectField(env, objMatrix, id_name);
+  jint jnbRow = (*env)->GetIntField(env, objMatrix, id_nbRow);
+  jint jnbCol = (*env)->GetIntField(env, objMatrix, id_nbCol);
+  
+  nbRow = jnbRow;
+  nbCol = jnbCol;
+
+  cname = (*env)->GetStringUTFChars(env, jname, NULL); 
+  matrix = (*env)->GetDoubleArrayElements(env, jmatrix, NULL);
+  
+  if (! C2F(cwritemat)((char *)cname, &nbRow , &nbCol, matrix, (unsigned long)strlen(cname)))
+  {
+    /* throws exceptions */
+  }
+                                                                       
+  (*env)->ReleaseStringUTFChars(env, jname , cname);
+  (*env)->ReleaseDoubleArrayElements(env, jmatrix, matrix, 0);
+}
+/********************************************************************************************************/
+JNIEXPORT void JNICALL Java_javasci_Scilab_receiveDoubleMatrix (JNIEnv *env, jclass cl, jobject objMatrix)
+{
+  const char *cname=NULL;
+  double *matrix=NULL, *tmp=NULL;
+  int nbRow, nbCol;
+  int i, j;
+  
+  jclass clMatrix = (*env)->GetObjectClass(env, objMatrix);
+  
+  jfieldID id_matrix =  (*env)->GetFieldID(env, clMatrix, "matrix", "[D" );
+  jfieldID id_name =  (*env)->GetFieldID(env, clMatrix, "name", "Ljava/lang/String;");
+  jfieldID id_nbRow =  (*env)->GetFieldID(env, clMatrix, "nbRow", "I" );
+  jfieldID id_nbCol =  (*env)->GetFieldID(env, clMatrix, "nbCol", "I" );
+  
+  jdoubleArray jmatrix = (*env)->GetObjectField(env, objMatrix, id_matrix);
+  jstring jname = (jstring) (*env)->GetObjectField(env, objMatrix, id_name);
+  jint jnbRow = (*env)->GetIntField(env, objMatrix, id_nbRow);
+  jint jnbCol = (*env)->GetIntField(env, objMatrix, id_nbCol);
+  
+  nbRow = jnbRow;
+  nbCol = jnbCol;
+
+  cname = (*env)->GetStringUTFChars(env, jname, NULL); 
+  matrix = (*env)->GetDoubleArrayElements(env, jmatrix, NULL);
+  
+  tmp = (double * ) MALLOC(nbRow * nbCol * sizeof(double));
+  if (! C2F(creadmat)((char *)cname, &nbRow , &nbCol, tmp, (unsigned long)strlen(cname) ))
+  {
+     /* throws exceptions */
+  }
+
+  for(i=0; i<nbRow; i++)
+  {
+    for(j=0; j<nbCol; j++)
+       {
+      matrix[i*nbCol+j] = tmp[j*nbRow+i];
+    }
+  }
+                                                       
+  FREE(tmp);
+  (*env)->ReleaseStringUTFChars(env, jname , cname);
+  (*env)->ReleaseDoubleArrayElements(env, jmatrix, matrix, 0);
+}
+/********************************************************************************************************/
+jobject getDoubleMatrix(JNIEnv *env,  jclass cl, jstring name, jint nbRow, jint nbCol)
+{
+  jclass clMatrix = (*env)->FindClass(env, "javasci/SciDoubleMatrix");
+  jmethodID consID = (*env)->GetMethodID(env, clMatrix, "<init>", "(Ljava/lang/String;II)V"); 
+  jobject objMatrix =  (*env)->NewObject(env, clMatrix, consID, name, nbRow, nbCol);
+  
+  Java_javasci_Scilab_receiveDoubleMatrix(env, cl, objMatrix);
+  return objMatrix;
+}
+/********************************************************************************************************/
+JNIEXPORT void JNICALL Java_javasci_Scilab_sendStringMatrix (JNIEnv *env, jclass cl, jobject objMatrix)
+{
+  #define MAX_String 1024
+  const char *cname;
+  int nbRow, nbCol;
+  int i, j, max=MAX_String;
+  jstring jelement;
+  const char *element;
+  char job[MAX_String*4];
+  
+  jclass clMatrix = (*env)->GetObjectClass(env, objMatrix);
+  
+  jfieldID id_matrix = (*env)->GetFieldID(env, clMatrix, "matrix", "[Ljava/lang/String;" );
+  jfieldID id_name =  (*env)->GetFieldID(env, clMatrix, "name", "Ljava/lang/String;");
+  jfieldID id_nbRow = (*env)->GetFieldID(env, clMatrix, "nbRow", "I" );
+  jfieldID id_nbCol = (*env)->GetFieldID(env, clMatrix, "nbCol", "I" );
+  
+  jobjectArray jmatrix = (*env)->GetObjectField(env, objMatrix, id_matrix);
+  jstring jname = (jstring) (*env)->GetObjectField(env, objMatrix, id_name);
+  jint jnbRow = (*env)->GetIntField(env, objMatrix, id_nbRow);
+  jint jnbCol = (*env)->GetIntField(env, objMatrix, id_nbCol);
+  
+  nbRow = jnbRow;
+  nbCol = jnbCol;
+
+  cname = (*env)->GetStringUTFChars(env, jname, NULL);
+   
+  for(i=0; i<nbRow; i++)
+  {
+    for(j=0; j<nbCol; j++)
+       {
+      jelement = (jstring)(*env)->GetObjectArrayElement(env, jmatrix, i*nbCol + j);
+      element = (*env)->GetStringUTFChars(env, jelement, NULL);
+      
+      sprintf(job,"%s(%d,%d)=\"\"%s\"\";",cname,i+1,j+1,element);
+      
+      if (send_scilab_job(job))
+         {
+               /* throws exceptions */
+      }
+      
+      (*env)->ReleaseStringUTFChars(env, jelement,  element);
+    }
+  }
+
+  (*env)->ReleaseStringUTFChars(env, jname , cname);
+}
+/********************************************************************************************************/
+JNIEXPORT void JNICALL Java_javasci_Scilab_receiveStringMatrix (JNIEnv *env, jclass cl, jobject objMatrix)
+{
+  const char *cname;
+  int nbRow, nbCol;
+  int i, j,  r, c, l, max=MAX_String;
+  char *element = (char *) MALLOC(sizeof(char) * max);
+  
+  jclass clMatrix = (*env)->GetObjectClass(env, objMatrix);
+  
+  jfieldID id_matrix =  (*env)->GetFieldID(env, clMatrix, "matrix", "[Ljava/lang/String;" );
+  jfieldID id_name =  (*env)->GetFieldID(env, clMatrix, "name", "Ljava/lang/String;");
+  jfieldID id_nbRow =  (*env)->GetFieldID(env, clMatrix, "nbRow", "I" );
+  jfieldID id_nbCol =  (*env)->GetFieldID(env, clMatrix, "nbCol", "I" );
+  
+  jobjectArray jmatrix = (*env)->GetObjectField(env, objMatrix, id_matrix);
+  jstring jname = (jstring) (*env)->GetObjectField(env, objMatrix, id_name);
+  jint jnbRow = (*env)->GetIntField(env, objMatrix, id_nbRow);
+  jint jnbCol = (*env)->GetIntField(env, objMatrix, id_nbCol);
+
+  jstring jelement; 
+  
+  nbRow = jnbRow;
+  nbCol = jnbCol;
+
+  cname = (*env)->GetStringUTFChars(env, jname, NULL);
+   
+  for(i=0; i<nbRow; i++)
+  {
+    for(j=0; j<nbCol; j++)
+       {
+      r = i+1;
+      c = j+1;
+      l = max;
+      
+      if (!C2F(creadchains)((char *)cname, &r, &c, &l, element, (unsigned long)strlen(cname), (unsigned long)strlen(element)))
+         {
+               /* throws exceptions */
+      }
+
+      jelement = (*env)->NewStringUTF(env, element);
+      (*env)->SetObjectArrayElement(env, jmatrix,  i*nbCol + j, jelement);
+    }
+  }
+  
+  FREE(element);
+  (*env)->ReleaseStringUTFChars(env, jname , cname);
+}
+/********************************************************************************************************/
+jobject getStringMatrix(JNIEnv *env,  jclass cl, jstring name, jint nbRow, jint nbCol)
+{
+  jclass clMatrix = (*env)->FindClass(env, "javasci/SciStringMatrix");
+  jmethodID consID = (*env)->GetMethodID(env, clMatrix, "<init>", "(Ljava/lang/String;II)V"); 
+  jobject objMatrix =  (*env)->NewObject(env, clMatrix, consID, name, nbRow, nbCol);
+  
+  Java_javasci_Scilab_receiveStringMatrix(env, cl, objMatrix);
+  return objMatrix;
+}
+/********************************************************************************************************/
+JNIEXPORT jobject JNICALL Java_javasci_Scilab_receiveDataByName (JNIEnv *env, jclass cl, jstring name)
+{
+  const char *cname;
+  int *header; 
+  jobject obj=NULL;
+  int type = 0;
+
+  cname = (*env)->GetStringUTFChars(env, name, NULL); 
+
+  if((header = (int *)GetDataFromName((char *)cname)) == NULL)
+  {
+    /* throws exception */
+  }
+
+  (*env)->ReleaseStringUTFChars(env, name , cname);
+  
+  type = header[0]; /* give type */
+
+  switch(type)
+  {
+  case sci_matrix : 
+    return getDoubleMatrix(env, cl, name, header[1], header[2]);
+  case sci_poly :
+    break;
+  case sci_boolean :
+    break;
+  case sci_ints :
+    break; 
+  case sci_strings :
+     return getStringMatrix(env, cl, name, header[1], header[2]);
+    break;
+  case sci_list :
+    break;
+  default :
+    break;
+  }
+  return obj;
+}
+/********************************************************************************************************/
index 56f577c..01220bb 100644 (file)
@@ -88,33 +88,33 @@ public class SciComplex implements java.io.Serializable
     Job( "disp(" + getName() +");");
   }
   /********************************************************************************************************/    
-  public String toString() \r
-  {\r
-    Get();\r
-       if (pTmpComplexRealArray[0]!=0 && pTmpComplexImaginaryArray[0]>0) \r
-       {\r
-               return pTmpComplexRealArray[0]+" + "+pTmpComplexImaginaryArray[0]+"i";\r
-    }\r
-    \r
-    if (pTmpComplexRealArray[0]!=0 && pTmpComplexImaginaryArray[0]<0) \r
-    {\r
-       return pTmpComplexRealArray[0]+" - "+(-pTmpComplexImaginaryArray[0])+"i";\r
-    }\r
-    \r
-    if (pTmpComplexImaginaryArray[0]==0) \r
-    {\r
-       return String.valueOf(pTmpComplexRealArray[0]);\r
-    }\r
-    \r
-    if (pTmpComplexRealArray[0]==0) \r
-    {\r
-       return pTmpComplexImaginaryArray[0]+"i";\r
-    }\r
-    \r
-    /*(unless Inf or NaN)*/\r
-    return pTmpComplexRealArray[0]+" + i*"+pTmpComplexImaginaryArray[0];\r
-        \r
-  }       \r
+  public String toString() 
+  {
+    Get();
+       if (pTmpComplexRealArray[0]!=0 && pTmpComplexImaginaryArray[0]>0) 
+       {
+               return pTmpComplexRealArray[0]+" + "+pTmpComplexImaginaryArray[0]+"i";
+    }
+    
+    if (pTmpComplexRealArray[0]!=0 && pTmpComplexImaginaryArray[0]<0) 
+    {
+       return pTmpComplexRealArray[0]+" - "+(-pTmpComplexImaginaryArray[0])+"i";
+    }
+    
+    if (pTmpComplexImaginaryArray[0]==0) 
+    {
+       return String.valueOf(pTmpComplexRealArray[0]);
+    }
+    
+    if (pTmpComplexRealArray[0]==0) 
+    {
+       return pTmpComplexImaginaryArray[0]+"i";
+    }
+    
+    /*(unless Inf or NaN)*/
+    return pTmpComplexRealArray[0]+" + i*"+pTmpComplexImaginaryArray[0];
+        
+  }       
   /********************************************************************************************************/    
 }
 /********************************************************************************************************/  
index fa33be5..dfd5c6d 100644 (file)
-package javasci ;\r
-/********************************************************************************************************/\r
-/* Allan CORNET */\r
-/* INRIA 2006 */\r
-/********************************************************************************************************/\r
-public class SciComplexArray implements java.io.Serializable  \r
-{\r
-/********************************************************************************************************/\r
-  private double [] x ; /* Real part */\r
-  private double [] y ; /* Imaginary part */\r
-  \r
-  private int m, n;\r
-  /* m number of rows */\r
-  /* n number of colons */\r
-  \r
-  private String name; \r
-/********************************************************************************************************/\r
-  private static native void Initialize();\r
-  /**\r
-  * Initialize Scilab interface\r
-  */\r
-    \r
-  public native boolean Job(String job);\r
-  /**\r
-  * Execute a command in Scilab \r
-  */\r
-  \r
-  public native void Get();\r
-  /**\r
-  * Get Matrix from Scilab\r
-  */\r
-  \r
-  public native void Send();\r
-  /**\r
-  * Send Matrix to Scilab \r
-  */\r
-  \r
-  public native double GetRealPartElement(int indr,int indc);\r
-  /**\r
-  * Get only ONE element from Scilab Matrix \r
-  * indr AND indc are indices in scilab \r
-  * Get Real Part\r
-  */\r
-\r
-\r
-  public native double GetImaginaryPartElement(int indr,int indc);\r
-  /**\r
-  * Get only ONE element from Scilab Matrix \r
-  * indr AND indc are indices in scilab \r
-  * Get Imaginary Part\r
-  */\r
-\r
-  \r
-  /**\r
-  * See SCI/examples/callsci/callsciJava/others for some simple examples \r
-  */\r
-/********************************************************************************************************/  \r
-  static \r
-  {\r
-    System.loadLibrary("javasci");\r
-    Initialize();\r
-  }\r
-/********************************************************************************************************/  \r
-  public SciComplexArray(String name,SciComplexArray Obj) \r
-  {\r
-    this.name = name;\r
-    this.m = Obj.getRow() ;\r
-    this.n = Obj.getCol();\r
-    \r
-    this.x = new double[m*n];\r
-    this.x =Obj.getRealPartData() ;\r
-    \r
-    this.y = new double[m*n];\r
-    this.y =Obj.getImaginaryPartData() ;\r
-    \r
-    Send();\r
-  }\r
-/********************************************************************************************************/  \r
-  public SciComplexArray(String name,int r,int c) \r
-  {\r
-    this.m = r ;\r
-    this.n = c ;\r
-    \r
-    this.x = new double[r*c];\r
-    this.y = new double[r*c];\r
-    \r
-    this.name = name;\r
-   \r
-    for ( int i = 0 ; i < r*c ; i++)\r
-    {\r
-       x[i]=0;\r
-       y[i]=0;\r
-    }\r
-    Send();\r
-  }\r
- /********************************************************************************************************/  \r
-  public SciComplexArray(String name,int r,int c,double [] x,double [] y )\r
-  {\r
-    if ( (r*c != x.length) && (r*c != y.length) )\r
-    {\r
-     throw new BadDataArgumentException("Bad Matrix call, size of third argument is wrong");\r
-    }\r
-    \r
-    this.m = r ;\r
-    this.n = c;\r
-    \r
-    this.x = x;\r
-    this.y = y;\r
-    \r
-    this.name = name;\r
-    \r
-    Send();\r
-  }\r
-/********************************************************************************************************/\r
-  public int getRow() \r
-  {\r
-   return m;\r
-  }\r
-/********************************************************************************************************/  \r
-  public int getCol() \r
-  {\r
-   return n;\r
-  }\r
-/********************************************************************************************************/  \r
-  public String getName()\r
-  {\r
-   return name;\r
-  }\r
-/********************************************************************************************************/  \r
-  public double[] getRealPartData() \r
-  {\r
-   Get();\r
-   return x;\r
-  }\r
-/********************************************************************************************************/    \r
-  public double[] getImaginaryPartData() \r
-  {\r
-   Get();\r
-   return y;\r
-  }\r
-/********************************************************************************************************/  \r
-  public void disp() \r
-  {\r
-    Get();\r
-    System.out.println("Matrix "+ getName() +"=");\r
-    Job( "disp(" + getName() +");");\r
-  }\r
-}\r
-/********************************************************************************************************/\r
+package javasci ;
+/********************************************************************************************************/
+/* Allan CORNET */
+/* INRIA 2006 */
+/********************************************************************************************************/
+public class SciComplexArray implements java.io.Serializable  
+{
+/********************************************************************************************************/
+  private double [] x ; /* Real part */
+  private double [] y ; /* Imaginary part */
+  
+  private int m, n;
+  /* m number of rows */
+  /* n number of colons */
+  
+  private String name; 
+/********************************************************************************************************/
+  private static native void Initialize();
+  /**
+  * Initialize Scilab interface
+  */
+    
+  public native boolean Job(String job);
+  /**
+  * Execute a command in Scilab 
+  */
+  
+  public native void Get();
+  /**
+  * Get Matrix from Scilab
+  */
+  
+  public native void Send();
+  /**
+  * Send Matrix to Scilab 
+  */
+  
+  public native double GetRealPartElement(int indr,int indc);
+  /**
+  * Get only ONE element from Scilab Matrix 
+  * indr AND indc are indices in scilab 
+  * Get Real Part
+  */
+
+
+  public native double GetImaginaryPartElement(int indr,int indc);
+  /**
+  * Get only ONE element from Scilab Matrix 
+  * indr AND indc are indices in scilab 
+  * Get Imaginary Part
+  */
+
+  
+  /**
+  * See SCI/examples/callsci/callsciJava/others for some simple examples 
+  */
+/********************************************************************************************************/  
+  static 
+  {
+    System.loadLibrary("javasci");
+    Initialize();
+  }
+/********************************************************************************************************/  
+  public SciComplexArray(String name,SciComplexArray Obj) 
+  {
+    this.name = name;
+    this.m = Obj.getRow() ;
+    this.n = Obj.getCol();
+    
+    this.x = new double[m*n];
+    this.x =Obj.getRealPartData() ;
+    
+    this.y = new double[m*n];
+    this.y =Obj.getImaginaryPartData() ;
+    
+    Send();
+  }
+/********************************************************************************************************/  
+  public SciComplexArray(String name,int r,int c) 
+  {
+    this.m = r ;
+    this.n = c ;
+    
+    this.x = new double[r*c];
+    this.y = new double[r*c];
+    
+    this.name = name;
+   
+    for ( int i = 0 ; i < r*c ; i++)
+    {
+       x[i]=0;
+       y[i]=0;
+    }
+    Send();
+  }
+ /********************************************************************************************************/  
+  public SciComplexArray(String name,int r,int c,double [] x,double [] y )
+  {
+    if ( (r*c != x.length) && (r*c != y.length) )
+    {
+     throw new BadDataArgumentException("Bad Matrix call, size of third argument is wrong");
+    }
+    
+    this.m = r ;
+    this.n = c;
+    
+    this.x = x;
+    this.y = y;
+    
+    this.name = name;
+    
+    Send();
+  }
+/********************************************************************************************************/
+  public int getRow() 
+  {
+   return m;
+  }
+/********************************************************************************************************/  
+  public int getCol() 
+  {
+   return n;
+  }
+/********************************************************************************************************/  
+  public String getName()
+  {
+   return name;
+  }
+/********************************************************************************************************/  
+  public double[] getRealPartData() 
+  {
+   Get();
+   return x;
+  }
+/********************************************************************************************************/    
+  public double[] getImaginaryPartData() 
+  {
+   Get();
+   return y;
+  }
+/********************************************************************************************************/  
+  public void disp() 
+  {
+    Get();
+    System.out.println("Matrix "+ getName() +"=");
+    Job( "disp(" + getName() +");");
+  }
+}
+/********************************************************************************************************/
index ec90fee..8e71f9d 100644 (file)
-package javasci ;\r
-/********************************************************************************************************/\r
-/* Allan CORNET */\r
-/* INRIA 2005 */\r
-/********************************************************************************************************/\r
-public class SciDoubleArray implements java.io.Serializable  \r
-{\r
-/********************************************************************************************************/\r
-  private double [] x ;\r
-  \r
-  private int m, n;\r
-  /* m number of rows */\r
-  /* n number of colons */\r
-  \r
-  private String name; \r
-/********************************************************************************************************/\r
-  private static native void Initialize();\r
-  /**\r
-  * Initialize Scilab interface\r
-  */\r
-    \r
-  public native boolean Job(String job);\r
-  /**\r
-  * Execute a command in Scilab \r
-  */\r
-  \r
-  public native void Get();\r
-  /**\r
-  * Get Matrix from Scilab\r
-  */\r
-  \r
-  public native void Send();\r
-  /**\r
-  * Send Matrix to Scilab \r
-  */\r
-  \r
-  public native double GetElement(int indr, int indc);\r
-  /**\r
-  * Get only ONE element from Scilab Matrix \r
-  * indr AND indc are indices in scilab \r
-  * in Scilab A=[1,2;3,4];\r
-  * A(1,1)=1 \r
-  * A(2,2)=4 \r
-  */\r
-  \r
-  /**\r
-  * See SCI/examples/callsci/callsciJava/others for some simple examples \r
-  */\r
-/********************************************************************************************************/  \r
-  static \r
-  {\r
-    System.loadLibrary("javasci");\r
-    Initialize();\r
-  }\r
-/********************************************************************************************************/  \r
-  public SciDoubleArray(String name,SciDoubleArray Obj) \r
-  {\r
-    this.name = name;\r
-    this.m = Obj.getRow() ;\r
-    this.n = Obj.getCol();\r
-    this.x = new double[m*n];\r
-   \r
-    this.x =Obj.getData() ;\r
-    Send();\r
-  }\r
-/********************************************************************************************************/  \r
-  public SciDoubleArray(String name,int r,int c) \r
-  {\r
-    this.m = r ;\r
-    this.n = c ;\r
-    this.x = new double[r*c];\r
-    this.name = name;\r
-   \r
-    for ( int i = 0 ; i < r*c ; i++)x[i]=0;\r
-    Send();\r
-  }\r
- /********************************************************************************************************/  \r
-  public SciDoubleArray(String name,int r,int c,double [] x )\r
-  {\r
-    if ( r*c != x.length) \r
-    {\r
-     throw new BadDataArgumentException("Bad Matrix call, size of third argument is wrong");\r
-    }\r
-    this.m = r ;\r
-    this.n = c;\r
-    this.x = x;\r
-    this.name = name;\r
-    Send();\r
-  }\r
-/********************************************************************************************************/\r
-  public int getRow() \r
-  {\r
-   return m;\r
-  }\r
-/********************************************************************************************************/  \r
-  public int getCol() \r
-  {\r
-   return n;\r
-  }\r
-/********************************************************************************************************/  \r
-  public String getName()\r
-  {\r
-   return name;\r
-  }\r
-/********************************************************************************************************/  \r
-  public double[] getData() \r
-  {\r
-   Get();\r
-   return x;\r
-  }\r
-/********************************************************************************************************/  \r
-  public void disp() \r
-  {\r
-       Get();\r
-    System.out.println("Matrix "+ getName() +"=");\r
-    Job( "disp(" + getName() +");");\r
-  }\r
-}\r
-/********************************************************************************************************/\r
+package javasci ;
+/********************************************************************************************************/
+/* Allan CORNET */
+/* INRIA 2005 */
+/********************************************************************************************************/
+public class SciDoubleArray implements java.io.Serializable  
+{
+/********************************************************************************************************/
+  private double [] x ;
+  
+  private int m, n;
+  /* m number of rows */
+  /* n number of colons */
+  
+  private String name; 
+/********************************************************************************************************/
+  private static native void Initialize();
+  /**
+  * Initialize Scilab interface
+  */
+    
+  public native boolean Job(String job);
+  /**
+  * Execute a command in Scilab 
+  */
+  
+  public native void Get();
+  /**
+  * Get Matrix from Scilab
+  */
+  
+  public native void Send();
+  /**
+  * Send Matrix to Scilab 
+  */
+  
+  public native double GetElement(int indr, int indc);
+  /**
+  * Get only ONE element from Scilab Matrix 
+  * indr AND indc are indices in scilab 
+  * in Scilab A=[1,2;3,4];
+  * A(1,1)=1 
+  * A(2,2)=4 
+  */
+  
+  /**
+  * See SCI/examples/callsci/callsciJava/others for some simple examples 
+  */
+/********************************************************************************************************/  
+  static 
+  {
+    System.loadLibrary("javasci");
+    Initialize();
+  }
+/********************************************************************************************************/  
+  public SciDoubleArray(String name,SciDoubleArray Obj) 
+  {
+    this.name = name;
+    this.m = Obj.getRow() ;
+    this.n = Obj.getCol();
+    this.x = new double[m*n];
+   
+    this.x =Obj.getData() ;
+    Send();
+  }
+/********************************************************************************************************/  
+  public SciDoubleArray(String name,int r,int c) 
+  {
+    this.m = r ;
+    this.n = c ;
+    this.x = new double[r*c];
+    this.name = name;
+   
+    for ( int i = 0 ; i < r*c ; i++)x[i]=0;
+    Send();
+  }
+ /********************************************************************************************************/  
+  public SciDoubleArray(String name,int r,int c,double [] x )
+  {
+    if ( r*c != x.length) 
+    {
+     throw new BadDataArgumentException("Bad Matrix call, size of third argument is wrong");
+    }
+    this.m = r ;
+    this.n = c;
+    this.x = x;
+    this.name = name;
+    Send();
+  }
+/********************************************************************************************************/
+  public int getRow() 
+  {
+   return m;
+  }
+/********************************************************************************************************/  
+  public int getCol() 
+  {
+   return n;
+  }
+/********************************************************************************************************/  
+  public String getName()
+  {
+   return name;
+  }
+/********************************************************************************************************/  
+  public double[] getData() 
+  {
+   Get();
+   return x;
+  }
+/********************************************************************************************************/  
+  public void disp() 
+  {
+       Get();
+    System.out.println("Matrix "+ getName() +"=");
+    Job( "disp(" + getName() +");");
+  }
+}
+/********************************************************************************************************/
index e7ddf0b..bb08f22 100644 (file)
@@ -1,89 +1,89 @@
-package javasci ;\r
-/********************************************************************************************************/\r
-/* Allan CORNET */\r
-/* INRIA 2005 */\r
-/********************************************************************************************************/\r
-public class Scilab\r
-{\r
-/********************************************************************************************************/\r
-  private static native void Initialize();\r
-  /**\r
-  * Initialize Scilab interface\r
-  */\r
-  \r
-  public static native void Events();  \r
-  /**\r
-  * do a Scilab event \r
-  * See SCI/examples/callsci/callsciJava/others/ExempleEvent.java \r
-  */\r
-  \r
-  public static native boolean HaveAGraph();\r
-  /**\r
-  * Detect if a Scilab graphic window is opened\r
-  */\r
-\r
-  public static native boolean Exec(String job);\r
-  /**\r
-  * Execute a command in Scilab\r
-  */\r
-  \r
-  public static native boolean ExistVar(String VarName);\r
-  /**\r
-  * Detect if Variable name exists in Scilab \r
-  */\r
-  \r
-  public static native int TypeVar(String VarName);\r
-  /**\r
-  * Get Scilab type  of a variable \r
-  * -1 not exist \r
-  * 1 : real or complex constant matrix. \r
-  * 2 : polynomial matrix.\r
-  * 4 : boolean matrix.\r
-  * 5 : sparse matrix.\r
-  * 6 : sparse boolean matrix.\r
-  * 8 : matrix of integers stored on 1 2 or 4 bytes \r
-  * 9 : matrix of graphic handles \r
-  * 10 : matrix of character strings.\r
-  * 11 : un-compiled function. \r
-  * 13 : compiled function.\r
-  * 14 : function library.\r
-  * 15 : list.\r
-  * 16 : typed list (tlist)\r
-  * 17 : mlist \r
-  * 128 : pointer \r
-  */\r
-  \r
-  public static native int GetLastErrorCode();\r
-  /**\r
-  * Get Last Error Code\r
-  * 0 no error\r
-  */\r
-  \r
-  public static boolean ExecuteScilabScript(String scriptfilename)\r
-  /**\r
-  * Execute a scilab script .sce\r
-  */\r
-  {\r
-               return Exec("exec(''"+scriptfilename+"'');");\r
-  }\r
-  \r
-  public static native boolean Finish();\r
-  /**\r
-  * When you finish to use Scilab Call scilab.quit, clean memory, ... \r
-  */\r
-\r
-  /**\r
-  * See SCI/examples/callsci/callsciJava/others \r
-  * and\r
-  * SCI/examples/callsci/callsciJava/ihm\r
-  * for some simple examples\r
-  */\r
-/********************************************************************************************************/\r
-  static \r
-  {\r
-    System.loadLibrary("javasci");\r
-    Initialize();\r
-  }\r
-/********************************************************************************************************/\r
-}\r
-/********************************************************************************************************/\r
+package javasci ;
+/********************************************************************************************************/
+/* Allan CORNET */
+/* INRIA 2005 */
+/********************************************************************************************************/
+public class Scilab
+{
+/********************************************************************************************************/
+  private static native void Initialize();
+  /**
+  * Initialize Scilab interface
+  */
+  
+  public static native void Events();  
+  /**
+  * do a Scilab event 
+  * See SCI/examples/callsci/callsciJava/others/ExempleEvent.java 
+  */
+  
+  public static native boolean HaveAGraph();
+  /**
+  * Detect if a Scilab graphic window is opened
+  */
+
+  public static native boolean Exec(String job);
+  /**
+  * Execute a command in Scilab
+  */
+  
+  public static native boolean ExistVar(String VarName);
+  /**
+  * Detect if Variable name exists in Scilab 
+  */
+  
+  public static native int TypeVar(String VarName);
+  /**
+  * Get Scilab type  of a variable 
+  * -1 not exist 
+  * 1 : real or complex constant matrix. 
+  * 2 : polynomial matrix.
+  * 4 : boolean matrix.
+  * 5 : sparse matrix.
+  * 6 : sparse boolean matrix.
+  * 8 : matrix of integers stored on 1 2 or 4 bytes 
+  * 9 : matrix of graphic handles 
+  * 10 : matrix of character strings.
+  * 11 : un-compiled function. 
+  * 13 : compiled function.
+  * 14 : function library.
+  * 15 : list.
+  * 16 : typed list (tlist)
+  * 17 : mlist 
+  * 128 : pointer 
+  */
+  
+  public static native int GetLastErrorCode();
+  /**
+  * Get Last Error Code
+  * 0 no error
+  */
+  
+  public static boolean ExecuteScilabScript(String scriptfilename)
+  /**
+  * Execute a scilab script .sce
+  */
+  {
+               return Exec("exec(''"+scriptfilename+"'');");
+  }
+  
+  public static native boolean Finish();
+  /**
+  * When you finish to use Scilab Call scilab.quit, clean memory, ... 
+  */
+
+  /**
+  * See SCI/examples/callsci/callsciJava/others 
+  * and
+  * SCI/examples/callsci/callsciJava/ihm
+  * for some simple examples
+  */
+/********************************************************************************************************/
+  static 
+  {
+    System.loadLibrary("javasci");
+    Initialize();
+  }
+/********************************************************************************************************/
+}
+/********************************************************************************************************/
index a717380..331cf94 100644 (file)
@@ -1,28 +1,28 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#ifndef __INITSCILAB__\r
-#define __INITSCILAB__\r
-\r
-#ifdef _MSC_VER\r
-#include <windows.h>\r
-#endif\r
-\r
-#include <stdio.h>\r
-#include "machine.h"\r
-#include "stack-c.h"\r
-#include "version.h"\r
-\r
-\r
-#ifndef NULL\r
-#define NULL 0\r
-#endif\r
-\r
-#define TRUE  1\r
-#define FALSE 0\r
-\r
-int C2F(initscilab)(void);\r
-\r
-#endif /* __INITSCILAB__ */\r
-/*-----------------------------------------------------------------------------------*/ \r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#ifndef __INITSCILAB__
+#define __INITSCILAB__
+
+#ifdef _MSC_VER
+#include <windows.h>
+#endif
+
+#include <stdio.h>
+#include "machine.h"
+#include "stack-c.h"
+#include "version.h"
+
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+#define TRUE  1
+#define FALSE 0
+
+int C2F(initscilab)(void);
+
+#endif /* __INITSCILAB__ */
+/*-----------------------------------------------------------------------------------*/ 
index 155813d..49bf4d5 100644 (file)
@@ -1,19 +1,19 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#ifndef __SCIQUIT__\r
-#define __SCIQUIT__\r
-\r
-#include <stdio.h>\r
-#include <string.h>\r
-#include "machine.h"\r
-#include "stack-c.h"\r
-#include "version.h"\r
-\r
-int C2F(sciquit)(void);\r
-int ExitScilab(void);\r
-int sci_exit(int n);\r
-\r
-#endif /*__SCIQUIT__*/\r
-/*-----------------------------------------------------------------------------------*/ \r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#ifndef __SCIQUIT__
+#define __SCIQUIT__
+
+#include <stdio.h>
+#include <string.h>
+#include "machine.h"
+#include "stack-c.h"
+#include "version.h"
+
+int C2F(sciquit)(void);
+int ExitScilab(void);
+int sci_exit(int n);
+
+#endif /*__SCIQUIT__*/
+/*-----------------------------------------------------------------------------------*/ 
index 8db3228..6c3aa90 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(scidint) _PARAMS((char *fname));\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_addinter) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(scidint)(fname);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(scidint) _PARAMS((char *fname));
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_addinter) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(scidint)(fname);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 3709ac1..d5bb68b 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intargn)();\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_argn) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intargn)();\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intargn)();
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_argn) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intargn)();
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 22af2be..912d732 100644 (file)
@@ -1,31 +1,31 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include <string.h>\r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(intbanner) _PARAMS((char *fname));\r
-extern void banner(void);\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_banner) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intbanner)(fname);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(intbanner) _PARAMS((char *fname))\r
-{\r
-       Rhs=Max(Rhs,0);\r
-       CheckRhs(0,0) ;\r
-       CheckLhs(0,1) ;\r
-\r
-       banner();\r
-\r
-       LhsVar(1) = 0;\r
-       C2F(putlhsvar)();       \r
-\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include <string.h>
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+int C2F(intbanner) _PARAMS((char *fname));
+extern void banner(void);
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_banner) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intbanner)(fname);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
+int C2F(intbanner) _PARAMS((char *fname))
+{
+       Rhs=Max(Rhs,0);
+       CheckRhs(0,0) ;
+       CheckLhs(0,1) ;
+
+       banner();
+
+       LhsVar(1) = 0;
+       C2F(putlhsvar)();       
+
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 3959983..1d20328 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(sciislink) _PARAMS((char *fname));\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_c_link) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(sciislink)(fname);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(sciislink) _PARAMS((char *fname));
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_c_link) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(sciislink)(fname);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 4de5684..eec54b1 100644 (file)
@@ -1,21 +1,21 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intfort) _PARAMS((char *fname));\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_fort) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intfort)(fname);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_call) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intfort)(fname);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intfort) _PARAMS((char *fname));
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_fort) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intfort)(fname);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_call) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intfort)(fname);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 77479ff..1765282 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intschdir) _PARAMS((char *fname));\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_chdir) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intschdir)(fname);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intschdir) _PARAMS((char *fname));
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_chdir) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intschdir)(fname);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index df713d9..62d6fe4 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intclear) _PARAMS((char *fname));\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_clear) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intclear)(fname);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intclear) _PARAMS((char *fname));
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_clear) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intclear)(fname);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index b8d48ee..bbf1c52 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intclearfun)();\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_clearfun) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intclearfun)();\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intclearfun)();
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_clearfun) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intclearfun)();
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 5921868..f5c2474 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intclearglobal) _PARAMS((char *fname));\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_clearglobal) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intclearglobal)(fname);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intclearglobal) _PARAMS((char *fname));
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_clearglobal) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intclearglobal)(fname);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index c0566f1..13705f1 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
- extern int C2F(intcomp)();\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_comp) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intcomp)();\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+ extern int C2F(intcomp)();
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_comp) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intcomp)();
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index eac8820..c66a740 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intdebug)();\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_debug) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intdebug)();\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intdebug)();
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_debug) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intdebug)();
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index bd63a87..1a70a5d 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intdelbpt)();\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_delbpt) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intdelbpt)();\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intdelbpt)();
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_delbpt) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intdelbpt)();
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 14de9c0..09266ab 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intdispbpt)();\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_dispbpt) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intdispbpt)();\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intdispbpt)();
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_dispbpt) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intdispbpt)();
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 631cbc5..8e33e93 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(interrcatch)();\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_errcatch) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(interrcatch)();\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(interrcatch)();
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_errcatch) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(interrcatch)();
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 6d50edd..24ee4a1 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(interrclear)();\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_errclear) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(interrclear)();\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(interrclear)();
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_errclear) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(interrclear)();
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index a90c781..7d79cf4 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(interror)();\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_error) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(interror)();\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(interror)();
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_error) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(interror)();
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 9907d91..d18c2cd 100644 (file)
@@ -1,16 +1,16 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intexists)(int *val);\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_exists) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       int val=0;\r
-       C2F(intexists)(&val);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intexists)(int *val);
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_exists) _PARAMS((char *fname,unsigned long fname_len))
+{
+       int val=0;
+       C2F(intexists)(&val);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index f2a99fd..17184ec 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intformat)();\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_format) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intformat)();\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intformat)();
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_format) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intformat)();
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 4c5a11c..197ad10 100644 (file)
@@ -1,44 +1,44 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "../../src/c/fromc.h"\r
-#include "MALLOC.h"\r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(intfromc) _PARAMS((char *fname));\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_fromc) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intfromc)(fname);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(intfromc) _PARAMS((char *fname))\r
-{\r
-       static int l1,n1,m1;\r
-       int *paramoutINT=(int*)MALLOC(sizeof(int));\r
-\r
-       Rhs = Max(0, Rhs);\r
-       CheckRhs(0,0);\r
-       CheckLhs(1,1);\r
-\r
-       if ( IsFromC() )\r
-       {\r
-               *paramoutINT=(int)(TRUE);\r
-       }\r
-       else\r
-       {\r
-               *paramoutINT=(int)(FALSE);\r
-       }\r
-\r
-       n1=1;\r
-       CreateVarFromPtr(1, "b", &n1, &n1, &paramoutINT);\r
-       LhsVar(1)=1;\r
-       C2F(putlhsvar)();\r
-       if (paramoutINT) {FREE(paramoutINT);paramoutINT=NULL;}\r
-\r
-       return 0;\r
-}\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "../../src/c/fromc.h"
+#include "MALLOC.h"
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+int C2F(intfromc) _PARAMS((char *fname));
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_fromc) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intfromc)(fname);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
+int C2F(intfromc) _PARAMS((char *fname))
+{
+       static int l1,n1,m1;
+       int *paramoutINT=(int*)MALLOC(sizeof(int));
+
+       Rhs = Max(0, Rhs);
+       CheckRhs(0,0);
+       CheckLhs(1,1);
+
+       if ( IsFromC() )
+       {
+               *paramoutINT=(int)(TRUE);
+       }
+       else
+       {
+               *paramoutINT=(int)(FALSE);
+       }
+
+       n1=1;
+       CreateVarFromPtr(1, "b", &n1, &n1, &paramoutINT);
+       LhsVar(1)=1;
+       C2F(putlhsvar)();
+       if (paramoutINT) {FREE(paramoutINT);paramoutINT=NULL;}
+
+       return 0;
+}
 /*-----------------------------------------------------------------------------------*/
\ No newline at end of file
index 3dc9cbb..d203108 100644 (file)
@@ -1,44 +1,44 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "../../src/c/fromjava.h"\r
-#include "MALLOC.h"\r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(intfromjava) _PARAMS((char *fname));\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_fromjava) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intfromjava)(fname);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(intfromjava) _PARAMS((char *fname))\r
-{\r
-       static int l1,n1,m1;\r
-       int *paramoutINT=(int*)MALLOC(sizeof(int));\r
-\r
-       Rhs = Max(0, Rhs);\r
-       CheckRhs(0,0);\r
-       CheckLhs(1,1);\r
-\r
-       if ( IsFromJava() )\r
-       {\r
-               *paramoutINT=(int)(TRUE);\r
-       }\r
-       else\r
-       {\r
-               *paramoutINT=(int)(FALSE);\r
-       }\r
-\r
-       n1=1;\r
-       CreateVarFromPtr(1, "b", &n1, &n1, &paramoutINT);\r
-       LhsVar(1)=1;\r
-       C2F(putlhsvar)();\r
-       if (paramoutINT) {FREE(paramoutINT);paramoutINT=NULL;}\r
-\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "../../src/c/fromjava.h"
+#include "MALLOC.h"
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+int C2F(intfromjava) _PARAMS((char *fname));
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_fromjava) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intfromjava)(fname);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
+int C2F(intfromjava) _PARAMS((char *fname))
+{
+       static int l1,n1,m1;
+       int *paramoutINT=(int*)MALLOC(sizeof(int));
+
+       Rhs = Max(0, Rhs);
+       CheckRhs(0,0);
+       CheckLhs(1,1);
+
+       if ( IsFromJava() )
+       {
+               *paramoutINT=(int)(TRUE);
+       }
+       else
+       {
+               *paramoutINT=(int)(FALSE);
+       }
+
+       n1=1;
+       CreateVarFromPtr(1, "b", &n1, &n1, &paramoutINT);
+       LhsVar(1)=1;
+       C2F(putlhsvar)();
+       if (paramoutINT) {FREE(paramoutINT);paramoutINT=NULL;}
+
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index c471fc6..76f6a67 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intfuncprot)();\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_funcprot) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intfuncprot)();\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intfuncprot)();
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_funcprot) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intfuncprot)();
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 5c5f3e0..fe20396 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intfunptr)();\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_funptr) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intfunptr)();\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intfunptr)();
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_funptr) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intfunptr)();
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index fdf1cfc..87e8ce6 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intsgetdir) _PARAMS((char *fname));\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_getcwd) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intsgetdir)(fname);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intsgetdir) _PARAMS((char *fname));
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_getcwd) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intsgetdir)(fname);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index ba956e9..e7b5458 100644 (file)
@@ -1,19 +1,19 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "../../src/c/history.h"\r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(gethistory) _PARAMS((char *fname));\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_gethistory) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(gethistory)(fname);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "../../src/c/history.h"
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(gethistory) _PARAMS((char *fname));
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_gethistory) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(gethistory)(fname);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
 int C2F(gethistory) _PARAMS((char *fname))
 {
 
index aeeca48..f9cf468 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intgetmd5) _PARAMS((char *fname));\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_getmd5) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intgetmd5)(fname);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intgetmd5) _PARAMS((char *fname));
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_getmd5) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intgetmd5)(fname);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 0d62ede..0faa7ee 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intgetmemory) _PARAMS((char *fname));\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_getmemory) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intgetmemory)(fname);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intgetmemory) _PARAMS((char *fname));
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_getmemory) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intgetmemory)(fname);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index c4d6cd9..8b7ea52 100644 (file)
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#ifdef _MSC_VER\r
-#include <windows.h>\r
-#include <stdio.h>\r
-#include "../../../libs/GetWindowsVersion/GetWindowsVersion.h"\r
-#else\r
-#include <sys/utsname.h>\r
-#endif\r
-\r
-#include "machine.h"\r
-#include "stack-c.h"\r
-#include "MALLOC.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intgetos) _PARAMS((char *fname));\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_getos) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intgetos)(fname);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
-/* Allan CORNET INRIA 2004 */\r
-int C2F(intgetos) _PARAMS((char *fname))\r
-{\r
-       static int l1,n1,m1;\r
-       char OperatinSystem[256];\r
-       char Release[256];\r
-       char *output=NULL;\r
-\r
-#ifndef _MSC_VER\r
-       struct utsname uname_pointer;\r
-#endif\r
-\r
-       Rhs=Max(0,Rhs);\r
-       CheckRhs(0,0);\r
-       CheckLhs(1,2);\r
-\r
-#if _MSC_VER\r
-\r
-\r
-       sprintf(OperatinSystem,"%s","Windows");\r
-\r
-       switch (GetWindowsVersion())\r
-       {\r
-       case OS_ERROR : default :\r
-               sprintf(Release,"%s","Unknow");\r
-               break;\r
-       case OS_WIN32_WINDOWS_NT_3_51 :\r
-               sprintf(Release,"%s","NT 3.51");\r
-               break;\r
-       case OS_WIN32_WINDOWS_NT_4_0 :\r
-               sprintf(Release,"%s","NT 4.0");\r
-               break;\r
-       case OS_WIN32_WINDOWS_95 :\r
-               sprintf(Release,"%s","95");\r
-               break;\r
-       case OS_WIN32_WINDOWS_98 :\r
-               sprintf(Release,"%s","98");\r
-               break;\r
-       case OS_WIN32_WINDOWS_Me :\r
-               sprintf(Release,"%s","ME");\r
-               break;\r
-       case OS_WIN32_WINDOWS_2000 :\r
-               sprintf(Release,"%s","2000");\r
-               break;\r
-       case OS_WIN32_WINDOWS_XP :\r
-               sprintf(Release,"%s","XP");\r
-               break;\r
-       case OS_WIN32_WINDOWS_XP_64 :\r
-               sprintf(Release,"%s","XP x64");\r
-               break;\r
-       case OS_WIN32_WINDOWS_SERVER_2003 :\r
-               sprintf(Release,"%s","Server 2003");\r
-               break;\r
-       case OS_WIN32_WINDOWS_SERVER_2003_R2 :\r
-               sprintf(Release,"%s","Server 2003 R2");\r
-               break;\r
-       case OS_WIN32_WINDOWS_SERVER_2003_64 :\r
-               sprintf(Release,"%s","Server 2003 x64");\r
-               break;\r
-       case OS_WIN32_WINDOWS_VISTA :\r
-               sprintf(Release,"%s","Vista");\r
-               break;\r
-       case OS_WIN32_WINDOWS_VISTA_64 :\r
-               sprintf(Release,"%s","Vista x64");\r
-               break;\r
-       case OS_WIN32_WINDOWS_LONGHORN :\r
-               sprintf(Release,"%s","Longhorn");\r
-               break;\r
-       case OS_WIN32_WINDOWS_LONGHORN_64 :\r
-               sprintf(Release,"%s","Longhorn x64");\r
-               break;\r
-\r
-       }\r
-#else\r
-       uname(&uname_pointer);\r
-       sprintf(OperatinSystem,"%s",uname_pointer.sysname);\r
-       sprintf(Release,"%s",uname_pointer.release);\r
-#endif\r
-\r
-\r
-       output=(char*)MALLOC((strlen(OperatinSystem)+1)*sizeof(char));\r
-       sprintf(output,"%s",OperatinSystem);\r
-       n1=1;\r
-       CreateVarFromPtr( 1, "c",(m1=(int)strlen(output), &m1),&n1,&output);\r
-       if (output) {FREE(output);output=NULL;}\r
-       LhsVar(1)=1;\r
-\r
-       if (Lhs==2)\r
-       {\r
-               char *output2=NULL;\r
-               output2=(char*)MALLOC((strlen(Release)+1)*sizeof(char));\r
-               sprintf(output2,"%s",Release);\r
-               n1=1;\r
-               CreateVarFromPtr( 2, "c",(m1=(int)strlen(output2), &m1),&n1,&output2);\r
-               if (output2) {FREE(output2);output2=NULL;}\r
-               LhsVar(2)=2;\r
-       }\r
-\r
-       C2F(putlhsvar)();\r
-\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#ifdef _MSC_VER
+#include <windows.h>
+#include <stdio.h>
+#include "../../../libs/GetWindowsVersion/GetWindowsVersion.h"
+#else
+#include <sys/utsname.h>
+#endif
+
+#include "machine.h"
+#include "stack-c.h"
+#include "MALLOC.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intgetos) _PARAMS((char *fname));
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_getos) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intgetos)(fname);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
+/* Allan CORNET INRIA 2004 */
+int C2F(intgetos) _PARAMS((char *fname))
+{
+       static int l1,n1,m1;
+       char OperatinSystem[256];
+       char Release[256];
+       char *output=NULL;
+
+#ifndef _MSC_VER
+       struct utsname uname_pointer;
+#endif
+
+       Rhs=Max(0,Rhs);
+       CheckRhs(0,0);
+       CheckLhs(1,2);
+
+#if _MSC_VER
+
+
+       sprintf(OperatinSystem,"%s","Windows");
+
+       switch (GetWindowsVersion())
+       {
+       case OS_ERROR : default :
+               sprintf(Release,"%s","Unknow");
+               break;
+       case OS_WIN32_WINDOWS_NT_3_51 :
+               sprintf(Release,"%s","NT 3.51");
+               break;
+       case OS_WIN32_WINDOWS_NT_4_0 :
+               sprintf(Release,"%s","NT 4.0");
+               break;
+       case OS_WIN32_WINDOWS_95 :
+               sprintf(Release,"%s","95");
+               break;
+       case OS_WIN32_WINDOWS_98 :
+               sprintf(Release,"%s","98");
+               break;
+       case OS_WIN32_WINDOWS_Me :
+               sprintf(Release,"%s","ME");
+               break;
+       case OS_WIN32_WINDOWS_2000 :
+               sprintf(Release,"%s","2000");
+               break;
+       case OS_WIN32_WINDOWS_XP :
+               sprintf(Release,"%s","XP");
+               break;
+       case OS_WIN32_WINDOWS_XP_64 :
+               sprintf(Release,"%s","XP x64");
+               break;
+       case OS_WIN32_WINDOWS_SERVER_2003 :
+               sprintf(Release,"%s","Server 2003");
+               break;
+       case OS_WIN32_WINDOWS_SERVER_2003_R2 :
+               sprintf(Release,"%s","Server 2003 R2");
+               break;
+       case OS_WIN32_WINDOWS_SERVER_2003_64 :
+               sprintf(Release,"%s","Server 2003 x64");
+               break;
+       case OS_WIN32_WINDOWS_VISTA :
+               sprintf(Release,"%s","Vista");
+               break;
+       case OS_WIN32_WINDOWS_VISTA_64 :
+               sprintf(Release,"%s","Vista x64");
+               break;
+       case OS_WIN32_WINDOWS_LONGHORN :
+               sprintf(Release,"%s","Longhorn");
+               break;
+       case OS_WIN32_WINDOWS_LONGHORN_64 :
+               sprintf(Release,"%s","Longhorn x64");
+               break;
+
+       }
+#else
+       uname(&uname_pointer);
+       sprintf(OperatinSystem,"%s",uname_pointer.sysname);
+       sprintf(Release,"%s",uname_pointer.release);
+#endif
+
+
+       output=(char*)MALLOC((strlen(OperatinSystem)+1)*sizeof(char));
+       sprintf(output,"%s",OperatinSystem);
+       n1=1;
+       CreateVarFromPtr( 1, "c",(m1=(int)strlen(output), &m1),&n1,&output);
+       if (output) {FREE(output);output=NULL;}
+       LhsVar(1)=1;
+
+       if (Lhs==2)
+       {
+               char *output2=NULL;
+               output2=(char*)MALLOC((strlen(Release)+1)*sizeof(char));
+               sprintf(output2,"%s",Release);
+               n1=1;
+               CreateVarFromPtr( 2, "c",(m1=(int)strlen(output2), &m1),&n1,&output2);
+               if (output2) {FREE(output2);output2=NULL;}
+               LhsVar(2)=2;
+       }
+
+       C2F(putlhsvar)();
+
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index b5b70ea..df6ee08 100644 (file)
@@ -1,97 +1,97 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include <string.h>\r
-#include "machine.h"\r
-#include "stack-c.h"\r
-#include "version.h" \r
-/*-----------------------------------------------------------------------------------*/\r
-static char Version[]=VERSION; \r
-extern int C2F(withtk)(int *rep);\r
-extern int C2F(withpvm)(int *rep);\r
-extern int C2F(withgtk)(int *rep);\r
-extern int C2F(withocaml)(int *rep);\r
-extern int C2F(withjavasci)(int *rep);\r
-extern int C2F(getcomp)(char *buf,int *nbuf,long int lbuf);\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(intversion) _PARAMS((char *fname,unsigned long fname_len));\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_getversion) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intversion)(fname,fname_len);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(intversion)(char * fname,unsigned long fname_len)\r
-{\r
-       static int n1,m1;\r
-       char *v = Version ;\r
-       Rhs=Max(0,Rhs);\r
-       CheckRhs(0,0);\r
-       CheckLhs(1,2);\r
-       n1=1;\r
-       CreateVarFromPtr( 1, "c",(m1=strlen(Version), &m1),&n1,&v);\r
-       LhsVar(1) = 1;\r
-       if (Lhs==2) {\r
-               static char *Str[12];\r
-               char tk[]="tk";\r
-               char pvm[]="pvm";\r
-               char ocaml[]="ocaml";\r
-               char javasci[]="javasci";\r
-               char atlas[]="atlas";\r
-               char debugmode[]="debug";\r
-               char releasemode[]="release";\r
-\r
-#ifdef __TIME__\r
-               char TimeBuild[]=__TIME__;\r
-#endif\r
-\r
-#ifdef __DATE__\r
-               char DateBuild[]=__DATE__;\r
-#endif\r
-               static int irep,nbuf;\r
-               n1=0;\r
-               C2F(getcomp)( C2F(cha1).buf,&nbuf,128);\r
-               Str[n1]=C2F(cha1).buf;n1++;\r
-               C2F(withpvm)(&irep);\r
-               if (irep) {Str[n1]=pvm;n1++;}\r
-               C2F(withtk)(&irep);\r
-               if (irep) {Str[n1]=tk;n1++;}\r
-               C2F(withocaml)(&irep);\r
-               if (irep) {Str[n1]=ocaml;n1++;}\r
-               C2F(withjavasci)(&irep);\r
-               if (irep) {Str[n1]=javasci;n1++;}\r
-#ifdef WITH_ATLAS\r
-               {Str[n1]=atlas;n1++;}\r
-#endif\r
-\r
-#ifdef _MSC_VER\r
-#if _DEBUG\r
-               {Str[n1]=debugmode;n1++;}\r
-#else\r
-               {Str[n1]=releasemode;n1++;}\r
-#endif\r
-#else\r
-#ifdef NDEBUG\r
-               {Str[n1]=releasemode;n1++;}\r
-#else\r
-               {Str[n1]=debugmode;n1++;}\r
-#endif\r
-#endif\r
-\r
-#ifdef __TIME__\r
-               {Str[n1]=DateBuild;n1++;}\r
-#endif\r
-\r
-#ifdef __DATE__\r
-               {Str[n1]=TimeBuild;n1++;}\r
-#endif\r
-               m1=1;\r
-               CreateVarFromPtr( 2, "S", &m1, &n1, Str);\r
-               LhsVar(2) = 2;\r
-       }\r
-       C2F(putlhsvar)();\r
-       return(0);\r
-}\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include <string.h>
+#include "machine.h"
+#include "stack-c.h"
+#include "version.h" 
+/*-----------------------------------------------------------------------------------*/
+static char Version[]=VERSION; 
+extern int C2F(withtk)(int *rep);
+extern int C2F(withpvm)(int *rep);
+extern int C2F(withgtk)(int *rep);
+extern int C2F(withocaml)(int *rep);
+extern int C2F(withjavasci)(int *rep);
+extern int C2F(getcomp)(char *buf,int *nbuf,long int lbuf);
+/*-----------------------------------------------------------------------------------*/
+int C2F(intversion) _PARAMS((char *fname,unsigned long fname_len));
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_getversion) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intversion)(fname,fname_len);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
+int C2F(intversion)(char * fname,unsigned long fname_len)
+{
+       static int n1,m1;
+       char *v = Version ;
+       Rhs=Max(0,Rhs);
+       CheckRhs(0,0);
+       CheckLhs(1,2);
+       n1=1;
+       CreateVarFromPtr( 1, "c",(m1=strlen(Version), &m1),&n1,&v);
+       LhsVar(1) = 1;
+       if (Lhs==2) {
+               static char *Str[12];
+               char tk[]="tk";
+               char pvm[]="pvm";
+               char ocaml[]="ocaml";
+               char javasci[]="javasci";
+               char atlas[]="atlas";
+               char debugmode[]="debug";
+               char releasemode[]="release";
+
+#ifdef __TIME__
+               char TimeBuild[]=__TIME__;
+#endif
+
+#ifdef __DATE__
+               char DateBuild[]=__DATE__;
+#endif
+               static int irep,nbuf;
+               n1=0;
+               C2F(getcomp)( C2F(cha1).buf,&nbuf,128);
+               Str[n1]=C2F(cha1).buf;n1++;
+               C2F(withpvm)(&irep);
+               if (irep) {Str[n1]=pvm;n1++;}
+               C2F(withtk)(&irep);
+               if (irep) {Str[n1]=tk;n1++;}
+               C2F(withocaml)(&irep);
+               if (irep) {Str[n1]=ocaml;n1++;}
+               C2F(withjavasci)(&irep);
+               if (irep) {Str[n1]=javasci;n1++;}
+#ifdef WITH_ATLAS
+               {Str[n1]=atlas;n1++;}
+#endif
+
+#ifdef _MSC_VER
+#if _DEBUG
+               {Str[n1]=debugmode;n1++;}
+#else
+               {Str[n1]=releasemode;n1++;}
+#endif
+#else
+#ifdef NDEBUG
+               {Str[n1]=releasemode;n1++;}
+#else
+               {Str[n1]=debugmode;n1++;}
+#endif
+#endif
+
+#ifdef __TIME__
+               {Str[n1]=DateBuild;n1++;}
+#endif
+
+#ifdef __DATE__
+               {Str[n1]=TimeBuild;n1++;}
+#endif
+               m1=1;
+               CreateVarFromPtr( 2, "S", &m1, &n1, Str);
+               LhsVar(2) = 2;
+       }
+       C2F(putlhsvar)();
+       return(0);
+}
 /*-----------------------------------------------------------------------------------*/
\ No newline at end of file
index 80392d3..6b327de 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intglobal)();\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_global) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intglobal)();\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intglobal)();
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_global) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intglobal)();
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 23331cb..cd7aeac 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intgstacksize)();\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_gstacksize) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intgstacksize)();\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intgstacksize)();
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_gstacksize) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intgstacksize)();
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index d9469bc..3e32fb5 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(inthavewindow)();\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_havewindow) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(inthavewindow)();\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(inthavewindow)();
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_havewindow) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(inthavewindow)();
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index bb7bdbb..3f58af0 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intsieee) _PARAMS((char *fname));\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_ieee) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intsieee)(fname);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intsieee) _PARAMS((char *fname));
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_ieee) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intsieee)(fname);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 14000a6..5857968 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intintppty)();\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_intppty) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intintppty)();\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intintppty)();
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_intppty) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intintppty)();
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index f4de620..99184be 100644 (file)
@@ -1,16 +1,16 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intexists)(int *val);\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_isdef) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       int val=1;\r
-       C2F(intexists)(&val);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intexists)(int *val);
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_isdef) _PARAMS((char *fname,unsigned long fname_len))
+{
+       int val=1;
+       C2F(intexists)(&val);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 398402d..647c77a 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intiserror)();\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_iserror) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intiserror)();\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intiserror)();
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_iserror) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intiserror)();
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 27f4ffe..dc56ec6 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intisglobal) _PARAMS((char *fname));\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_isglobal) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intisglobal)(fname);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intisglobal) _PARAMS((char *fname));
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_isglobal) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intisglobal)(fname);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 858ca7e..b2be7a0 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(lasterror) _PARAMS((char *fname));\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_lasterror) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(lasterror)(fname);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(lasterror) _PARAMS((char *fname));
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_lasterror) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(lasterror)(fname);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 5ba1643..9b47535 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intlines)();\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_lines) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intlines)();\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intlines)();
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_lines) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intlines)();
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 56fa6ac..cbe72c6 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(scilink) _PARAMS((char *fname));\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_link) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(scilink)(fname);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(scilink) _PARAMS((char *fname));
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_link) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(scilink)(fname);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index c48f1a2..8265469 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(loadhistory) _PARAMS((char *fname));\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_loadhistory) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(loadhistory)(fname);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(loadhistory) _PARAMS((char *fname));
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_loadhistory) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(loadhistory)(fname);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 2a84e40..bd8e3fc 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intmacrovar)();\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_macr2lst) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intmacrovar)();\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intmacrovar)();
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_macr2lst) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intmacrovar)();
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 00ad2f6..999ee9f 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(macr2tree) _PARAMS((char *fname));\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_macr2tree) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(macr2tree)(fname);\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(macr2tree) _PARAMS((char *fname));
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_macr2tree) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(macr2tree)(fname);
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 95425de..3010e31 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intmode)();\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_mode) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intmode)();\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intmode)();
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_mode) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intmode)();
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 18f4123..669f806 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intmtlbmode)();\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_mtlb_mode) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intmtlbmode)();\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intmtlbmode)();
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_mtlb_mode) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intmtlbmode)();
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index 4cc5a80..86b9f8a 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intnewfun)();\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_newfun) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intnewfun)();\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intnewfun)();
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_newfun) _PARAMS((char *fname,unsigned long fname_len))
+{
+       C2F(intnewfun)();
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
index f540519..c3f6088 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2006 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-#include "stack-c.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-extern int C2F(intpredef)();\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(sci_predef) _PARAMS((char *fname,unsigned long fname_len))\r
-{\r
-       C2F(intpredef)();\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2006 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+#include "stack-c.h"
+/*-----------------------------------------------------------------------------------*/
+extern int C2F(intpredef)();
+/*-----------------------------------------------------------------------------------*/
+int C2F(sci_predef) _PARAMS((char *fname,unsigned long