* printf, msprintf, mprintf, print moved in output_stream module.
+* disp moved in output_stream module.
+
Input/Output functions:
=======================
sci_gateway/c/sci_unix.c \
sci_gateway/c/sci_getf.c \
sci_gateway/c/sci_oldsave.c \
-sci_gateway/c/sci_save.c \
-sci_gateway/c/sci_disp.c
+sci_gateway/c/sci_save.c
GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_export_to_hdf5.cpp
sci_gateway/fortran/intrat.f \
sci_gateway/fortran/intwritb.f \
sci_gateway/fortran/intwrite.f \
-sci_gateway/fortran/intdisp.f \
sci_gateway/fortran/intread4b.f \
sci_gateway/fortran/intdeff.f \
sci_gateway/fortran/intlib.f \
int C2F(sci_readb)(char *fname,unsigned long fname_len);
int C2F(sci_writb)(char *fname,unsigned long fname_len);
int C2F(sci_execstr)(char *fname,unsigned long fname_len);
-int C2F(sci_disp)(char *fname,unsigned long fname_len);
int C2F(sci_getpid)(char *fname,unsigned long fname_len);
int C2F(sci_getenv)(char *fname,unsigned long fname_len);
int C2F(sci_read4b)(char *fname,unsigned long fname_len);
int C2F(intexec) (char *fname,unsigned long fname_len);
int C2F(intgetf)(void);
int C2F(intsave)(void);
-int C2F(intdisp) (void);
int C2F(intdiary)(void);
int C2F(intdeff)(void);
int C2F(intfile)(void);
*/
#include "gw_io.h"
+#include "gw_output_stream.h" /* sci_disp */
#include "stack-c.h"
#include "callFunctionFromGateway.h"
/*--------------------------------------------------------------------------*/
{C2F(sci_readb),"readb"},
{C2F(sci_writb),"writb"},
{C2F(sci_execstr),"execstr"},
-{C2F(sci_disp),"disp"},
{C2F(sci_getpid),"getpid"},
{C2F(sci_getenv),"getenv"},
{C2F(sci_read4b),"read4b"},
}
case 7:
{
- C2F(intdisp)();
+ #define disp_fname "disp"
+ sci_disp(disp_fname,strlen(disp_fname));
return 0;
}
case 8:
C2F(intexec)("exec",(unsigned long)strlen("exec"));
return 0;
}
+ default:
+ return 0;
}
}
else
<PRIMITIVE gatewayId="5" primitiveId="14" primitiveName="readb" />
<PRIMITIVE gatewayId="5" primitiveId="15" primitiveName="writb" />
<PRIMITIVE gatewayId="5" primitiveId="16" primitiveName="execstr" />
-<PRIMITIVE gatewayId="5" primitiveId="17" primitiveName="disp" />
-<PRIMITIVE gatewayId="5" primitiveId="18" primitiveName="getpid" />
-<PRIMITIVE gatewayId="5" primitiveId="19" primitiveName="getenv" />
-<PRIMITIVE gatewayId="5" primitiveId="20" primitiveName="read4b" />
-<PRIMITIVE gatewayId="5" primitiveId="21" primitiveName="write4b" />
-<PRIMITIVE gatewayId="5" primitiveId="22" primitiveName="save" />
-<PRIMITIVE gatewayId="5" primitiveId="23" primitiveName="load" />
-<PRIMITIVE gatewayId="5" primitiveId="24" primitiveName="mgetl" />
-<PRIMITIVE gatewayId="5" primitiveId="25" primitiveName="getio" />
-<PRIMITIVE gatewayId="5" primitiveId="26" primitiveName="setenv" />
-<PRIMITIVE gatewayId="5" primitiveId="27" primitiveName="export_to_hdf5" />
+<PRIMITIVE gatewayId="5" primitiveId="17" primitiveName="getpid" />
+<PRIMITIVE gatewayId="5" primitiveId="18" primitiveName="getenv" />
+<PRIMITIVE gatewayId="5" primitiveId="19" primitiveName="read4b" />
+<PRIMITIVE gatewayId="5" primitiveId="20" primitiveName="write4b" />
+<PRIMITIVE gatewayId="5" primitiveId="21" primitiveName="save" />
+<PRIMITIVE gatewayId="5" primitiveId="22" primitiveName="load" />
+<PRIMITIVE gatewayId="5" primitiveId="23" primitiveName="mgetl" />
+<PRIMITIVE gatewayId="5" primitiveId="24" primitiveName="getio" />
+<PRIMITIVE gatewayId="5" primitiveId="25" primitiveName="setenv" />
+<PRIMITIVE gatewayId="5" primitiveId="26" primitiveName="export_to_hdf5" />
</GATEWAY>
\ No newline at end of file
>
</File>
<File
- RelativePath="..\..\sci_gateway\c\sci_disp.c"
- >
- </File>
- <File
RelativePath="..\..\sci_gateway\c\sci_exec.c"
>
</File>
; io_f
; ---------------------------------------
intdeff_
- intdisp_
intexec_
intexecstr_
intfile_
<Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
<Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
<File RelativePath="..\..\sci_gateway\fortran\intdeff.f"/>
- <File RelativePath="..\..\sci_gateway\fortran\intdisp.f"/>
<File RelativePath="..\..\sci_gateway\fortran\intexec.f"/>
<File RelativePath="..\..\sci_gateway\fortran\intexecstr.f"/>
<File RelativePath="..\..\sci_gateway\fortran\intfile.f"/>
>
</File>
<File
- RelativePath="..\..\sci_gateway\fortran\intdisp.c"
- >
- </File>
- <File
RelativePath="..\..\sci_gateway\fortran\intexec.c"
>
</File>
>
</File>
<File
- RelativePath="..\..\sci_gateway\fortran\intdisp.f"
- >
- </File>
- <File
RelativePath="..\..\sci_gateway\fortran\intexec.f"
>
</File>
GATEWAY_C_SOURCES = sci_gateway/c/gw_output_stream.c \
sci_gateway/c/sci_print.c \
sci_gateway/c/sci_mprintf.c \
- sci_gateway/c/sci_msprintf.c
+ sci_gateway/c/sci_msprintf.c \
+ sci_gateway/c/sci_disp.c
-GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/intprint.f
+GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/intprint.f \
+ sci_gateway/fortran/intdisp.f
libscioutput_stream_la_CFLAGS= -I$(top_srcdir)/libs/MALLOC/includes/ \
-I$(srcdir)/includes/ \
int sci_print(char *fname,unsigned long fname_len);
int sci_mprintf(char *fname,unsigned long fname_len);
int sci_msprintf(char *fname,unsigned long fname_len);
+int sci_disp(char *fname,unsigned long fname_len);
/*--------------------------------------------------------------------------*/
#endif /* __GW_OUTPUT_STREAM_H__ */
/*--------------------------------------------------------------------------*/
static gw_generic_table Tab[]={
{sci_print, "print"},
{sci_mprintf, "mprintf"},
- {sci_msprintf, "msprintf"}
+ {sci_msprintf, "msprintf"},
+ {sci_disp, "disp"}
};
/*--------------------------------------------------------------------------*/
int gw_output_stream(void)
*
*/
-#include "gw_io.h"
+#include "machine.h"
+#include "gw_output_stream.h"
/*--------------------------------------------------------------------------*/
-int C2F(sci_disp)(char *fname,unsigned long fname_len)
+extern int C2F(intdisp)(); /* fortran subroutine */
+/*--------------------------------------------------------------------------*/
+int sci_disp(char *fname,unsigned long fname_len)
{
C2F(intdisp)();
return 0;
<PRIMITIVE gatewayId="33" primitiveId="1" primitiveName="print" />
<PRIMITIVE gatewayId="33" primitiveId="2" primitiveName="mprintf" />
<PRIMITIVE gatewayId="33" primitiveId="3" primitiveName="msprintf" />
+<PRIMITIVE gatewayId="33" primitiveId="4" primitiveName="disp" />
</GATEWAY>
\ No newline at end of file
>
</File>
<File
+ RelativePath="..\..\sci_gateway\c\sci_disp.c"
+ >
+ </File>
+ <File
RelativePath="..\..\sci_gateway\c\sci_mprintf.c"
>
</File>
EXPORTS
prntid_
intprint_
+intdisp_
basouttofile_
\ No newline at end of file
getilist_
funs_
clunit_
+objvide_
;elementary_functions
sciround_
\ No newline at end of file
<File RelativePath=".\fmt.f"/>
<File RelativePath=".\fmttyp.f"/>
<File RelativePath=".\formatnumber.f"/>
+ <File RelativePath="..\..\sci_gateway\fortran\intdisp.f"/>
<File RelativePath="..\..\sci_gateway\fortran\intprint.f"/>
<File RelativePath=".\lspdsp.f"/>
<File RelativePath=".\print.f"/>
>
</File>
<File
+ RelativePath="..\..\sci_gateway\fortran\intdisp.c"
+ >
+ </File>
+ <File
RelativePath="..\..\sci_gateway\fortran\intprint.c"
>
</File>
>
</File>
<File
+ RelativePath="..\..\sci_gateway\fortran\intdisp.f"
+ >
+ </File>
+ <File
RelativePath="..\..\sci_gateway\fortran\intprint.f"
>
</File>
--- /dev/null
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2007-2008 - INRIA - Allan CORNET <allan.cornet@inria.fr>
+//
+// This file is distributed under the same license as the Scilab package.
+// =============================================================================
+disp([1 2],3);
+
+ 3.
+
+ 1. 2.
+disp('A string');
+
+ A string
+disp("høyesterettsjustitiarius","disp test :");
+
+ disp test :
+
+ høyesterettsjustitiarius
+deff('[]=%t_p(l)','disp(l(3),l(2))');
+disp(tlist('t',1,2));
+
+
+ 1.
+
+ 2.
+text=[ "中文測試"; "азеазеясдвклгхклмвцмзер"; ..
+ "ድቅስድቅስግጅክልውሽችክልዝ"; ..
+"すべての人間は、生まれながらにして自由であり、かつ、尊厳と権利と について平等である。人間は、理性と良心とを授けられており、互いに同 胞の精神をもって行動しなければならない。"; ..
+"人 人 生 而 自 由, 在 尊 严 和 权 利 上 一 律 平 等。 他 们 赋 有 理 性 和 良 心, 并 应 以 兄 弟 关 系 的 精 神 相 对 待。"; ..
+"لد جميع الناس أحرارًا متساوين في الكرامة والحقوق. وقد وهبوا عقلاً وضميرًا وعليهم أن يعامل بعضهم بعضًا بروح الإخاء";..
+"כל בני האדם נולדו בני חורין ושווים בערכם ובזכיותיהם. כולם חוננו בתבונה ובמצפון, לפיכך חובה עליהם לנהג איש ברעהו ברוח של אחוה"
+];
+disp(text);
+
+!中文測試 !
+! !
+!азеазеясдвклгхклмвцмзер !
+! !
+!ድቅስድቅስግጅክልውሽችክልዝ !
+! !
+!ãã¹ã¦ã®äººéã¯ãçã¾ããªããã«ãã¦èªç±ã§ãããã!
+! ã¤ãå°å³ã¨æ¨©å©ã¨ ã«ã¤ãã¦å¹³çã§ããã人éã!
+! ¯ãçæ§ã¨è¯å¿ã¨ãæãããã¦ãããäºãã«å è!
+! の精神をもって行動しなければならない。 !
+! !
+!人 人 ç è èª ç±, å¨ å° ä¸¥ å æ å© ä¸ ä¸ å¾ å¹³ çã!
+! ä» ä»¬ èµ æ ç æ§ å è¯ å¿, å¹¶ åº ä»¥ å
å¼ å
³ ç³!
+! » ç ç²¾ ç¥ ç¸ å¯¹ å¾
ã !
+! !
+!لد جميع الناس أحرارًا متساوين في الكرا!
+! مة والحقوق. وقد وهبوا عقلاً وضميرًا !
+! ÙØ¹ÙÙÙÙ
Ø£Ù ÙØ¹Ø§Ù
٠بعضÙÙ
Ø¨Ø¹Ø¶ÙØ§ Ø¨Ø±ÙØ Ø§ÙØ!
+! ¥Ø®Ø§Ø¡ !
+! !
+!×× ×× × ×××× × ×××× ×× × ××ר×× ×ש×××× ×ער×!
+! × ××××××ת×××. ×××× ××× × × ×ת××× × ×××!
+! צפון, לפיכך חובה עליהם לנהג איש ברעה!
+! ו ברוח של אחוה !
--- /dev/null
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2007-2008 - INRIA - Allan CORNET <allan.cornet@inria.fr>
+//
+// This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+disp([1 2],3);
+disp('A string');
+disp("høyesterettsjustitiarius","disp test :");
+deff('[]=%t_p(l)','disp(l(3),l(2))');
+disp(tlist('t',1,2));
+
+
+text=[ "中文測試"; "азеазеясдвклгхклмвцмзер"; ..
+ "ድቅስድቅስግጅክልውሽችክልዝ"; ..
+"すべての人間は、生まれながらにして自由であり、かつ、尊厳と権利と について平等である。人間は、理性と良心とを授けられており、互いに同 胞の精神をもって行動しなければならない。"; ..
+"人 人 生 而 自 由, 在 尊 严 和 权 利 上 一 律 平 等。 他 们 赋 有 理 性 和 良 心, 并 应 以 兄 弟 关 系 的 精 神 相 对 待。"; ..
+"لد جميع الناس أحرارًا متساوين في الكرامة والحقوق. وقد وهبوا عقلاً وضميرًا وعليهم أن يعامل بعضهم بعضًا بروح الإخاء";..
+"כל בני האדם נולדו בני חורין ושווים בערכם ובזכיותיהם. כולם חוננו בתבונה ובמצפון, לפיכך חובה עליהם לנהג איש ברעהו ברוח של אחוה"
+];
+
+disp(text);
\ No newline at end of file