summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimon2009-08-24 12:04:57 +0000
committersimon2009-08-24 12:04:57 +0000
commit156a875285755250c3f1c634131887bd769925b9 (patch)
tree94cbb102fbaa782d976c34852dad699c64774fc1
parent9e529fd201724428f43a69f9a17b2f1b70a49ed0 (diff)
downloadscilab2c-156a875285755250c3f1c634131887bd769925b9.tar.gz
scilab2c-156a875285755250c3f1c634131887bd769925b9.tar.bz2
scilab2c-156a875285755250c3f1c634131887bd769925b9.zip
updated FA_SZ_SEL* to make them able to handle "r" and "c" arguments
-rw-r--r--scilab2c/macros/FunctionAnnotation/FA_SZ_SEL1.sci12
-rw-r--r--scilab2c/macros/FunctionAnnotation/FA_SZ_SEL2.sci4
2 files changed, 10 insertions, 6 deletions
diff --git a/scilab2c/macros/FunctionAnnotation/FA_SZ_SEL1.sci b/scilab2c/macros/FunctionAnnotation/FA_SZ_SEL1.sci
index 4f52c536..ccafe2d9 100644
--- a/scilab2c/macros/FunctionAnnotation/FA_SZ_SEL1.sci
+++ b/scilab2c/macros/FunctionAnnotation/FA_SZ_SEL1.sci
@@ -24,15 +24,19 @@ function opout = FA_SZ_SEL1(in1,in2)
// ------------------------------
// --- Check input arguments. ---
-// ------------------------------
+// ------------------------------
+
+
SCI2CNInArgCheck(argn(2),2,2);
ReportFileName = '';
in2 = string(in2);
-if (in2 == '1')
+if (in2 == '1' | in2 == '""rr""' ) // Where can r become rr ???
opout = '1';
-elseif (in2 == '2')
- opout = in1;
+elseif (in2 == '2' | in2 == '""c""' )
+ opout = in1;
+
+
else
PrintStringInfo(' ',ReportFileName,'both','y');
PrintStringInfo('SCI2CERROR: Cannot associate the second input argument to a known specifier.',ReportFileName,'both','y');
diff --git a/scilab2c/macros/FunctionAnnotation/FA_SZ_SEL2.sci b/scilab2c/macros/FunctionAnnotation/FA_SZ_SEL2.sci
index ebf74282..69b38fd1 100644
--- a/scilab2c/macros/FunctionAnnotation/FA_SZ_SEL2.sci
+++ b/scilab2c/macros/FunctionAnnotation/FA_SZ_SEL2.sci
@@ -29,9 +29,9 @@ SCI2CNInArgCheck(argn(2),2,2);
ReportFileName = '';
in2 = string(in2);
-if (in2 == '1')
+if (in2 == '1'| in2 == '""rr""')
opout = in1;
-elseif (in2 == '2')
+elseif (in2 == '2'| in2 == '""c""')
opout = '1';
else
PrintStringInfo(' ',ReportFileName,'both','y');