diff options
Diffstat (limited to 'macros/FunctionAnnotation')
| -rw-r--r-- | macros/FunctionAnnotation/FA_GetFunAnn.sci | 10 | ||||
| -rw-r--r-- | macros/FunctionAnnotation/FA_MAX.sci | 2 | ||||
| -rw-r--r-- | macros/FunctionAnnotation/FA_SZ_OPPLUS.sci | 4 | ||||
| -rw-r--r-- | macros/FunctionAnnotation/FA_SZ_SEL1.sci | 2 | ||||
| -rw-r--r-- | macros/FunctionAnnotation/FA_SZ_SEL2.sci | 2 | ||||
| -rw-r--r-- | macros/FunctionAnnotation/FA_TP_USER.sci | 2 |
6 files changed, 10 insertions, 12 deletions
diff --git a/macros/FunctionAnnotation/FA_GetFunAnn.sci b/macros/FunctionAnnotation/FA_GetFunAnn.sci index 98956785..86b99328 100644 --- a/macros/FunctionAnnotation/FA_GetFunAnn.sci +++ b/macros/FunctionAnnotation/FA_GetFunAnn.sci @@ -107,14 +107,14 @@ while ((meof(inclsfid) == 0) & (FoundNIn == 0) & (FoundNOut == 0)) PrintStringInfo('SCI2CERROR: Incorrect format for function annotation.',ReportFileName,'both','y');
PrintStringInfo('SCI2CERROR: Expected '+SharedInfo.Annotations.FUNNIN+' field in the annotations of the function.',ReportFileName,'both','y');
PrintStringInfo(' ',ReportFileName,'both','y');
- SCI2Cerror(' ');
+ error(9999, 'SCI2CERROR: Incorrect format for function annotation.');
end
else
PrintStringInfo(' ',ReportFileName,'both','y');
PrintStringInfo('SCI2CERROR: Incorrect format for function annotation.',ReportFileName,'both','y');
PrintStringInfo('SCI2CERROR: Expected '+SharedInfo.Annotations.FUNNIN+' field in the annotations of the function.',ReportFileName,'both','y');
PrintStringInfo(' ',ReportFileName,'both','y');
- SCI2Cerror(' ');
+ error(9999, 'SCI2CERROR: Incorrect format for function annotation.');
end
end
end
@@ -129,7 +129,7 @@ if (FoundNOut*FoundNIn == 0) PrintStringInfo('SCI2CERROR: 1. Syntax error in function annotations.',ReportFileName,'both','y');
PrintStringInfo('SCI2CERROR: 2. Missing the right combination of NIN/NOUT annotations: ""'+SharedInfo.Annotations.FUNNIN+string(NInArg)+','+SharedInfo.Annotations.FUNNOUT+' '+string(NOutArg)+'"".',ReportFileName,'both','y');
PrintStringInfo(' ',ReportFileName,'both','y');
- SCI2Cerror(' ');
+ error(9999, 'SCI2CERROR: Incorrect function annotation.');
else
for cntout = 1:NOutArg
SCI2C_nout=cntout; // Useful for eval.
@@ -153,7 +153,7 @@ else PrintStringInfo(' ',ReportFileName,'both','y');
PrintStringInfo('SCI2CERROR: Line '+string(line_position)+' Function type annotation not found in file: '+SCI2CClassFileName,ReportFileName,'both','y');
PrintStringInfo(' ',ReportFileName,'both','y');
- SCI2Cerror(' ');
+ error(9999, 'SCI2CERROR: Line '+string(line_position)+' Function type annotation not found in file: '+SCI2CClassFileName);
end
// #RNU_RES_B
@@ -178,7 +178,7 @@ else PrintStringInfo(' ',ReportFileName,'both','y');
PrintStringInfo('SCI2CERROR: Line '+string(line_position)+' Function size annotation not found in file: '+SCI2CClassFileName,ReportFileName,'both','y');
PrintStringInfo(' ',ReportFileName,'both','y');
- SCI2Cerror(' ');
+ error(9999, 'SCI2CERROR: Line '+string(line_position)+' Function size annotation not found in file: '+SCI2CClassFileName);
end
end
end
diff --git a/macros/FunctionAnnotation/FA_MAX.sci b/macros/FunctionAnnotation/FA_MAX.sci index c725dd23..c5406f14 100644 --- a/macros/FunctionAnnotation/FA_MAX.sci +++ b/macros/FunctionAnnotation/FA_MAX.sci @@ -25,8 +25,6 @@ function opout = FA_MAX(in1,in2) // ------------------------------ SCI2CNInArgCheck(argn(2),2,2); -//SCI2Cerror('Not allowed to use FA_MAX in this release.'); - // ------------------------ // --- Generate Output. --- // ------------------------ diff --git a/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci b/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci index aae50af6..f439e23e 100644 --- a/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci +++ b/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci @@ -67,7 +67,7 @@ elseif ((in1type == 'g') & (in2type == 'g')) in1num = eval(in1size(1));
in2num = eval(in2size(1));
if (in1num > 1 | in2num > 1)
- SCI2Cerror('String catenation can be performed only on strings of 1 x N size not N x 1 size');
+ error(9999, 'String catenation can be performed only on strings of 1 x N size not N x 1 size');
//NUT: mi pare che non possano proprio esistere stringe di dimensione Nx1 perche' in
//NUT: scilab esiste il tipo string che e' di size 1x1 e sono io a trasformarlo in
//NUT: 1xN per cui se uso sempre questa convenzione non sbaglio mai.
@@ -87,7 +87,7 @@ elseif ((in1type == 'g') & (in2type == 'g')) opoutsize(2) = '('+string(in1size(2))+'+'+string(in2size(2))+'-1)';
end
else
- SCI2Cerror('Unexpected type combination for ""+"" operator (type1,type2): ('+in1type+in2type+').');
+ error(9999, 'Unexpected type combination for ""+"" operator (type1,type2): ('+in1type+in2type+').');
end
endfunction
diff --git a/macros/FunctionAnnotation/FA_SZ_SEL1.sci b/macros/FunctionAnnotation/FA_SZ_SEL1.sci index ccafe2d9..6071e960 100644 --- a/macros/FunctionAnnotation/FA_SZ_SEL1.sci +++ b/macros/FunctionAnnotation/FA_SZ_SEL1.sci @@ -43,6 +43,6 @@ else PrintStringInfo('SCI2CERROR: Please rearrange your code by using one of the following specifiers:',ReportFileName,'both','y');
PrintStringInfo('SCI2CERROR: 1 or 2.',ReportFileName,'both','y');
PrintStringInfo(' ',ReportFileName,'both','y');
- SCI2Cerror(' ');
+ error(9999, 'SCI2CERROR: Cannot associate the second input argument to a known specifier.');
end
endfunction
diff --git a/macros/FunctionAnnotation/FA_SZ_SEL2.sci b/macros/FunctionAnnotation/FA_SZ_SEL2.sci index 69b38fd1..b0be739f 100644 --- a/macros/FunctionAnnotation/FA_SZ_SEL2.sci +++ b/macros/FunctionAnnotation/FA_SZ_SEL2.sci @@ -39,6 +39,6 @@ else PrintStringInfo('SCI2CERROR: Please rearrange your code by using one of the following specifiers:',ReportFileName,'both','y');
PrintStringInfo('SCI2CERROR: 1 or 2.',ReportFileName,'both','y');
PrintStringInfo(' ',ReportFileName,'both','y');
- SCI2Cerror(' ');
+ error(9999, 'SCI2CERROR: Cannot associate the second input argument to a known specifier.');
end
endfunction
diff --git a/macros/FunctionAnnotation/FA_TP_USER.sci b/macros/FunctionAnnotation/FA_TP_USER.sci index 3b306a9f..e60a8ce8 100644 --- a/macros/FunctionAnnotation/FA_TP_USER.sci +++ b/macros/FunctionAnnotation/FA_TP_USER.sci @@ -33,6 +33,6 @@ elseif (mtlb_strcmp(PrecisionSpecifier,'double')) elseif (mtlb_strcmp(PrecisionSpecifier,'default'))
type_out = DefaultType;
else
- SCI2Cerror('Unknown precision function: ""'+AnnotationFnc+'"".');
+ error(9999, 'Unknown precision function: ""'+AnnotationFnc+'"".');
end
endfunction
|