From 52de97290366abe6cfb0576ca19d9c1732c1f0ea Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Tue, 18 Oct 2016 10:31:23 +0530 Subject: Suppressed declaration of not required variables and functions --- macros/ASTManagement/AST2Ccode.bin | Bin 31996 -> 32492 bytes macros/ASTManagement/AST2Ccode.sci | 5 + macros/ASTManagement/AST_ExtractNameAndScope.bin | Bin 13180 -> 13184 bytes macros/ASTManagement/AST_ExtractNameAndScope.sci | 1 + macros/ASTManagement/AST_GetPrecAndLhsArg.bin | Bin 12360 -> 12552 bytes macros/ASTManagement/AST_GetPrecAndLhsArg.sci | 4 +- macros/ASTManagement/AST_HandleEndGenFun.bin | Bin 93256 -> 96888 bytes macros/ASTManagement/AST_HandleEndGenFun.sci | 32 +++- macros/ASTManagement/AST_HandleHeader.bin | Bin 40400 -> 39124 bytes macros/ASTManagement/AST_HandleHeader.sci | 8 - macros/FunctionAnnotation/FA_GetFunAnn.bin | Bin 30680 -> 31780 bytes macros/FunctionAnnotation/FA_GetFunAnn.sci | 15 +- macros/SymbolTable/ST_GetInArgInfo.sci | 2 +- .../ToolInitialization/INIT_FillSCI2LibCDirs.bin | Bin 1283828 -> 1279656 bytes .../ToolInitialization/INIT_FillSCI2LibCDirs.sci | 164 +++++++++------------ macros/findDeps/getAllSources.bin | Bin 196164 -> 195712 bytes macros/findDeps/getAllSources.sci | 4 +- macros/scilab2c.bin | Bin 20180 -> 19980 bytes macros/scilab2c.sci | 4 +- 19 files changed, 122 insertions(+), 117 deletions(-) (limited to 'macros') diff --git a/macros/ASTManagement/AST2Ccode.bin b/macros/ASTManagement/AST2Ccode.bin index 5f8c96b5..f931fd3a 100644 Binary files a/macros/ASTManagement/AST2Ccode.bin and b/macros/ASTManagement/AST2Ccode.bin differ diff --git a/macros/ASTManagement/AST2Ccode.sci b/macros/ASTManagement/AST2Ccode.sci index 275aadf4..b42fe954 100644 --- a/macros/ASTManagement/AST2Ccode.sci +++ b/macros/ASTManagement/AST2Ccode.sci @@ -152,6 +152,11 @@ while ~meof(fidAST) case 'Lhs :' then SharedInfo.Equal.Lhs = 1; // 1 means that we are inside the Lhs block of the Equal [EqualInArgName,EqualInArgScope,EqualNInArg] = AST_ReadEqualRhsNames(FileInfo,SharedInfo); + + lengthNumber = length('Number_'); + if (part(EqualInArgScope,1:lengthNumber) == 'Number_') + SharedInfo.SkipNextEqual = 1 + end SharedInfo.Equal.NInArg = EqualNInArg; for tmpcnt = 1:SharedInfo.Equal.NInArg SharedInfo.Equal.InArg(tmpcnt).Name = EqualInArgName(tmpcnt); diff --git a/macros/ASTManagement/AST_ExtractNameAndScope.bin b/macros/ASTManagement/AST_ExtractNameAndScope.bin index 260f69a5..1944d88b 100644 Binary files a/macros/ASTManagement/AST_ExtractNameAndScope.bin and b/macros/ASTManagement/AST_ExtractNameAndScope.bin differ diff --git a/macros/ASTManagement/AST_ExtractNameAndScope.sci b/macros/ASTManagement/AST_ExtractNameAndScope.sci index fe5dc05a..1dbaaad7 100644 --- a/macros/ASTManagement/AST_ExtractNameAndScope.sci +++ b/macros/ASTManagement/AST_ExtractNameAndScope.sci @@ -75,6 +75,7 @@ if (SCI2Cstrncmps1size(tagname(1),ASTField)) ArgName = stripblanks(part(ASTField,taglength(1)+3:fieldlength)); ArgScope = stripblanks(part(ASTField,1:taglength(1)+1)); end + elseif (SCI2Cstrncmps1size(tagname(2),ASTField)) ArgName = stripblanks(part(ASTField,taglength(2)+1:fieldlength)); ArgName = part(ArgName,2:length(ArgName)-1); // I remove also the first and the last " diff --git a/macros/ASTManagement/AST_GetPrecAndLhsArg.bin b/macros/ASTManagement/AST_GetPrecAndLhsArg.bin index d35ce90a..71e44cb1 100644 Binary files a/macros/ASTManagement/AST_GetPrecAndLhsArg.bin and b/macros/ASTManagement/AST_GetPrecAndLhsArg.bin differ diff --git a/macros/ASTManagement/AST_GetPrecAndLhsArg.sci b/macros/ASTManagement/AST_GetPrecAndLhsArg.sci index 07ad3b0a..f45c29e5 100644 --- a/macros/ASTManagement/AST_GetPrecAndLhsArg.sci +++ b/macros/ASTManagement/AST_GetPrecAndLhsArg.sci @@ -57,7 +57,8 @@ end // --- Check Last Function Condition and update LhsArg info. --- // ------------------------------------------------------------- // #RNU_RES_E -if (ASTFunType~='Equal') +if ((ASTFunType~='Equal')& (NOutArg ~= 0)) + //If NOutArg = 0, bypass. // #RNU_RES_B PrintStringInfo(' ',ReportFileName,'file','y'); PrintStringInfo(' Checking presence of Equal after the current function...',ReportFileName,'file','y'); @@ -68,7 +69,6 @@ else LhsArgScope = ''; NLhsArg = 0; end - // --- Generate the LhsArg structure. --- LhsArg = []; for cntarg = 1:NLhsArg diff --git a/macros/ASTManagement/AST_HandleEndGenFun.bin b/macros/ASTManagement/AST_HandleEndGenFun.bin index 123ff516..f16974e2 100644 Binary files a/macros/ASTManagement/AST_HandleEndGenFun.bin and b/macros/ASTManagement/AST_HandleEndGenFun.bin differ diff --git a/macros/ASTManagement/AST_HandleEndGenFun.sci b/macros/ASTManagement/AST_HandleEndGenFun.sci index df4334f4..5086680b 100644 --- a/macros/ASTManagement/AST_HandleEndGenFun.sci +++ b/macros/ASTManagement/AST_HandleEndGenFun.sci @@ -72,6 +72,7 @@ global STACKDEDUG //NUT: verifica se ASTFunType e' veramente importante // #RNU_RES_E [ASTFunName,InArg,NInArg,OutArg,NOutArg] = AST_GetFuncallPrm(FileInfo,SharedInfo,ASTFunType); +NOutArg_mod = NOutArg if(mtlb_strcmp(part(ASTFunName,1:2),'CV') == %T) SharedInfo.OpenCVUsed = %T; end @@ -118,13 +119,14 @@ global STACKDEDUG // --- Read the function annotations. --- // -------------------------------------- // #RNU_RES_E + if (ASTFunName == 'OpEqual') FunTypeAnnot = ''; FunSizeAnnot = ''; else - [FunTypeAnnot,FunSizeAnnot] = FA_GetFunAnn(NInArg,NOutArg,ASTFunName,FileInfo,SharedInfo); + [FunTypeAnnot,FunSizeAnnot,NOutArg_mod] = FA_GetFunAnn(NInArg,NOutArg,ASTFunName,FileInfo,SharedInfo); end - + // #RNU_RES_B // ------------------------------------------------------------------------------------------- // --- Search for Equal Lhs and precision specifier to be applied to the current function. --- @@ -310,7 +312,7 @@ global STACKDEDUG else OutArg = FA_GetOutArgInfo(InArg,NInArg,OutArg,NOutArg,SharedInfo,FunPrecSpecifier,FunTypeAnnot,FunSizeAnnot,ReportFileName); end - + // #RNU_RES_B // --- Generate the names for the output arguments. --- // Update of OutArg.Name and OutArg.Scope fields. @@ -324,7 +326,21 @@ global STACKDEDUG else [OutArg,SharedInfo] = GenOutArgNames(ASTFunName,InArg,NInArg,OutArg,NOutArg,LhsArg,NLhsArg,FileInfo,SharedInfo); end - + + if ((ASTFunName == 'uint8') & (NInArg == 1) & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number')) + OutArg(1).Value = InArg(1).Value; + SharedInfo.SkipNextFun = 1; + elseif ((ASTFunName == 'int8') & (NInArg == 1) & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number')) + OutArg(1).Value = InArg(1).Value; + SharedInfo.SkipNextFun = 1; + elseif ((ASTFunName == 'uint16') & (NInArg == 1) & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number')) + OutArg(1).Value = InArg(1).Value; + SharedInfo.SkipNextFun = 1; + elseif ((ASTFunName == 'int16') & (NInArg == 1) & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number')) + OutArg(1).Value = InArg(1).Value; + SharedInfo.SkipNextFun = 1; + end + // #RNU_RES_B // --- Push in the AST stack the Output arguments. --- // #RNU_RES_E @@ -340,6 +356,7 @@ global STACKDEDUG end end + // #RNU_RES_B //NUT: verificare se si puo' accorpare qualcosa qui sotto //RN: non capisco come mai analizzo lo scope dopo che faccio il push nello stack dove lo utilizzo!!! @@ -360,6 +377,7 @@ global STACKDEDUG //#RNUREM_ME --- Store the while condition variable (if any). --- SharedInfo = GetWhileCondVariable(OutArg,NOutArg,ASTFunName,FileInfo,SharedInfo); + //#RNUREM_ME --- Update Symbol Table with output arguments. --- if ((ASTFunName == 'OpMinus') & (NInArg == 1) & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number')) @@ -399,8 +417,8 @@ global STACKDEDUG // --- Generate the C name of the function. --- // -------------------------------------------- //#RNU_RES_E - - CFunName = C_GenerateFunName(ASTFunName,InArg,NInArg,OutArg,NOutArg); + //disp(OutArg,InArg,ASTFunName) + CFunName = C_GenerateFunName(ASTFunName,InArg,NInArg,OutArg,NOutArg_mod); //#RNU_RES_B PrintStringInfo(' C Function Name: '+CFunName,ReportFileName,'file','y'); @@ -448,7 +466,7 @@ global STACKDEDUG //NUT: magari posso fare una funzione che inserisce solo i campi diversi e fa un check su quelli che //NUT: dovrebbero essere identici. //#RNU_RES_E - GenCFunDatFiles(ASTFunName,FunPrecSpecifier,FunTypeAnnot,FunSizeAnnot,InArg,NInArg,OutArg,NOutArg,CFunName,LibTypeInfo,FunInfoDatDir); + GenCFunDatFiles(ASTFunName,FunPrecSpecifier,FunTypeAnnot,FunSizeAnnot,InArg,NInArg,OutArg,NOutArg_mod,CFunName,LibTypeInfo,FunInfoDatDir); //#RNU_RES_B // ----------------------------------- diff --git a/macros/ASTManagement/AST_HandleHeader.bin b/macros/ASTManagement/AST_HandleHeader.bin index 078d21b0..268846f6 100644 Binary files a/macros/ASTManagement/AST_HandleHeader.bin and b/macros/ASTManagement/AST_HandleHeader.bin differ diff --git a/macros/ASTManagement/AST_HandleHeader.sci b/macros/ASTManagement/AST_HandleHeader.sci index 98875a3b..75b2f972 100644 --- a/macros/ASTManagement/AST_HandleHeader.sci +++ b/macros/ASTManagement/AST_HandleHeader.sci @@ -107,14 +107,6 @@ load(fullfile(FileInfo.FunctionList.FunInfoDatDir,SharedInfo.NextCFunName+'.dat' SharedInfo.CurrentFunInfo = FunInfo; clear FunInfo -//Required if single file is being translated and has input/outputs -if(SharedInfo.RunMode == "FunCall") -[FunTypeAnnot,FunSizeAnnot] = FA_GetFunAnn(NInArg,NOutArg,FunctionName,FileInfo,SharedInfo); - if((nxtscifunname == SharedInfo.SCIMainFunName)) - SharedInfo.CurrentFunInfo.FunTypeAnnot = FunTypeAnnot; - SharedInfo.CurrentFunInfo.FunSizeAnnot = FunSizeAnnot; - end -end //#RNU_RES_B // ----------------------------------------------------------------------------- // --- Check coherence between In/Out names and In/Out Arg structure loaded. --- diff --git a/macros/FunctionAnnotation/FA_GetFunAnn.bin b/macros/FunctionAnnotation/FA_GetFunAnn.bin index 3c2f9d4c..b38770ee 100644 Binary files a/macros/FunctionAnnotation/FA_GetFunAnn.bin and b/macros/FunctionAnnotation/FA_GetFunAnn.bin differ diff --git a/macros/FunctionAnnotation/FA_GetFunAnn.sci b/macros/FunctionAnnotation/FA_GetFunAnn.sci index 912d099a..d11e3cee 100644 --- a/macros/FunctionAnnotation/FA_GetFunAnn.sci +++ b/macros/FunctionAnnotation/FA_GetFunAnn.sci @@ -1,4 +1,4 @@ -function [FunTypeAnnot,FunSizeAnnot] = ... +function [FunTypeAnnot,FunSizeAnnot,NOutArg_mod] = ... FA_GetFunAnn(NInArg,NOutArg,FunName,FileInfo,SharedInfo) // function [FunTypeAnnot,FunSizeAnnot] = ... // FA_GetFunAnn(NInArg,NOutArg,FunName,FileInfo,SharedInfo) @@ -71,6 +71,7 @@ while ((meof(inclsfid) == 0) & (FoundNIn == 0) & (FoundNOut == 0)) // #RNU_RES_E if (SCI2Cstrncmps1size(SharedInfo.Annotations.FUNNIN,check_string)) FUNNINAnnot = part(check_string,length(SharedInfo.Annotations.FUNNIN)+1:length(check_string)); + // #RNU_RES_B // --- Check NIN value. --- // #RNU_RES_E @@ -89,7 +90,6 @@ while ((meof(inclsfid) == 0) & (FoundNIn == 0) & (FoundNOut == 0)) // #RNU_RES_E if (SCI2Cstrncmps1size(SharedInfo.Annotations.FUNNOUT,check_string)) FUNNOUTAnnot = part(check_string,length(SharedInfo.Annotations.FUNNOUT)+1:length(check_string)); - // #RNU_RES_B // --- Check NOUT value. --- // #RNU_RES_E @@ -99,6 +99,8 @@ while ((meof(inclsfid) == 0) & (FoundNIn == 0) & (FoundNOut == 0)) ReportFileName,'file','y'); // #RNU_RES_E FoundNOut = 1; + elseif(eval(FUNNOUTAnnot) == 0) + FoundNOut = 1 else FoundNIn = 0; end @@ -131,6 +133,15 @@ if (FoundNOut*FoundNIn == 0) PrintStringInfo(' ',ReportFileName,'both','y'); error(9999, 'SCI2CERROR: Incorrect function annotation.'); else + //This change has been made in order to supress the generation + //of output variables in case of functions which do not return + //anything. + if(eval(FUNNOUTAnnot) == 0) + NOutArg_mod = 0; + else + NOutArg_mod = NOutArg + end + // In case we are reading to much informations readNewLine = %t; diff --git a/macros/SymbolTable/ST_GetInArgInfo.sci b/macros/SymbolTable/ST_GetInArgInfo.sci index 03b067a1..27069310 100644 --- a/macros/SymbolTable/ST_GetInArgInfo.sci +++ b/macros/SymbolTable/ST_GetInArgInfo.sci @@ -47,7 +47,7 @@ UpdatedInArg = InArg; for cntinarg = 1:NInArg tmpname = InArg(cntinarg).Name; - tmpscope = InArg(cntinarg).Scope; + tmpscope = InArg(cntinarg).Scope; lengthNumber = length('Number_'); if (part(tmpscope,1:lengthNumber) == 'Number_') // #RNU_RES_B diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin index 16791aef..77219541 100644 Binary files a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin and b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin differ diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 14b7d41c..b00b7b83 100644 --- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -3141,34 +3141,34 @@ ClassName = 'Disp'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 1',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 0',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('s0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('c0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('z0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('g0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('u80'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('i80'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('u160'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('i160'+ArgSeparator+'d0',ClassFileName,'file','y'); - -PrintStringInfo('s2'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('c2'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('z2'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('g2'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('u82'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('i82'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('u162'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('i162'+ArgSeparator+'d0',ClassFileName,'file','y'); - -PrintStringInfo('d3'+ArgSeparator+'d0',ClassFileName,'file','y'); +PrintStringInfo('s0'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('d0'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('c0'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('z0'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('g0'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('u80'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('i80'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('u160'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('i160'+ArgSeparator+'',ClassFileName,'file','y'); + +PrintStringInfo('s2'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('d2'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('c2'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('z2'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('g2'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('u82'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('i82'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('u162'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('i162'+ArgSeparator+'',ClassFileName,'file','y'); + +PrintStringInfo('d3'+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'disp'; // AS : Done AS : Float_Done @@ -4325,15 +4325,15 @@ ClassName = 'cmd_digital_out'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 3',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 0 ',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('d0d0u80'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('d0d0d0'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('d0d0u80'+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'cmd_digital_out'; @@ -4375,15 +4375,15 @@ ClassName = 'cmd_analog_out'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 3',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 0 ',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('d0d0u80'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('d0d0d0'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('d0d0u80'+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'cmd_analog_out'; @@ -4425,14 +4425,14 @@ ClassName = 'cmd_dcmotor_setup'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 5',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 0 ',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0d0d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('d0d0d0d0d0'+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'cmd_dcmotor_setup'; @@ -4449,15 +4449,15 @@ ClassName = 'cmd_dcmotor_run'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 3',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 0 ',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('d0d0i160'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('d0d0d0'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('d0d0i160'+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'cmd_dcmotor_run'; @@ -4472,14 +4472,14 @@ ClassName = 'cmd_servo_attach'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 2',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 0',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); //---Function List Class.----- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('d0d0'+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'cmd_servo_attach'; @@ -4495,14 +4495,14 @@ ClassName = 'cmd_servo_detach'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 2',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 0',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); //---Function List Class.----- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('d0d0'+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'cmd_servo_detach'; @@ -4518,14 +4518,14 @@ ClassName = 'cmd_servo_move'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 3',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 0',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); //---Function List Class.----- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('d0d0d0'+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'cmd_servo_move'; @@ -4544,14 +4544,14 @@ ClassName = 'sleep'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 1',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 0',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('d0'+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'sleep'; @@ -4574,7 +4574,7 @@ ClassName = 'AVRDigitalSetup'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 3',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 0 ',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); @@ -4600,7 +4600,7 @@ ClassName = 'AVRDigitalOut'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 3',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 0 ',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); @@ -4655,7 +4655,7 @@ ClassName = 'AVRADCSetup'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 2',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 0 ',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); @@ -4706,7 +4706,7 @@ ClassName = 'AVRPWMSetup'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 4',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 0',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); @@ -4730,7 +4730,7 @@ ClassName = 'AVRPWMSetDuty'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 2',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 0 ',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); @@ -4754,7 +4754,7 @@ ClassName = 'RPI_DigitalSetup'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 2',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 0',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); @@ -4779,31 +4779,6 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -//------------------------------------ -//---- Class RPI_DigitalOut ---------- -//------------------------------------ -//ClassName = 'RPI_DigitalOut'; - -// --- Class Annotation. --- -//PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); -//ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -//PrintStringInfo('NIN= 2',ClassFileName,'file','y'); -//PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); -//PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y'); -//PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); -//PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); - -// --- Function List Class. --- -//ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); - -//PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -//FunctionName = 'RPI_DigitalOut'; -//PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -//INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -//INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); - //------------------------------------ //---- Class RPI_DigitalIn ----------- //------------------------------------ @@ -4832,21 +4807,21 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //------------------------------------ //---- Class RPI_DelayMilli ---------- //------------------------------------ -//ClassName = 'RPI_DelayMilli'; +ClassName = 'RPI_DelayMilli'; -// --- Class Annotation. --- -//PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); -//ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -//PrintStringInfo('NIN= 1',ClassFileName,'file','y'); -//PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); -//PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y'); -//PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); -//PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); +//--- Class Annotation. --- +PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); +ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); +PrintStringInfo('NIN= 1',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 0 ',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); -// --- Function List Class. --- -//ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); +//--- Function List Class. --- +ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -//PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_DelayMilli'; @@ -4924,7 +4899,7 @@ PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 2',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).TP= ''u16''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); @@ -4977,7 +4952,7 @@ ClassName = 'RPI_SerialSendData'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 2',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 0 ',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); @@ -5590,20 +5565,20 @@ PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 2',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 0',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); PrintStringInfo('NIN= 1',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 0',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('g2mt0'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('mt0'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('g2mt0'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('mt0'+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'CV_ShowImage'; @@ -5626,13 +5601,18 @@ PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 1',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 0',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('d0'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('s0'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('u80'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('i80'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('u160'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('i160'+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'CV_WaitKey'; diff --git a/macros/findDeps/getAllSources.bin b/macros/findDeps/getAllSources.bin index 0a2a3ced..35b6bd03 100644 Binary files a/macros/findDeps/getAllSources.bin and b/macros/findDeps/getAllSources.bin differ diff --git a/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci index 71739919..1693598f 100644 --- a/macros/findDeps/getAllSources.sci +++ b/macros/findDeps/getAllSources.sci @@ -1011,7 +1011,7 @@ function allSources = getAllSources(SharedInfo) "src/c/hardware/rasberrypi/timing/u16RPIDelayMicros.c" "src/c/hardware/rasberrypi/timing/u32RPIGetMillis.c" "src/c/hardware/rasberrypi/timing/u32RPIGetMicros.c" - "src/c/hardware/rasberrypi/serial/u8RPISerialSetups.c" + "src/c/hardware/rasberrypi/serial/u16RPISerialSetups.c" "src/c/hardware/rasberrypi/serial/u8RPISerialCloses.c" "src/c/hardware/rasberrypi/serial/u8RPISerialSendChars.c" "src/c/hardware/rasberrypi/serial/u8RPISerialSendDatas.c" @@ -1041,8 +1041,6 @@ function allSources = getAllSources(SharedInfo) OpenCV_files = [ "src/c/imageProcessing/cvcore/imcvCreateImages.cpp" "src/c/imageProcessing/cvcore/imcvGetImgSizes.cpp" - "src/c/imageProcessing/cvhighgui/imcvLoadImages.cpp" - "src/c/imageProcessing/cvhighgui/imcvShowImages.cpp" "src/c/imageProcessing/cvimgproc/imcvCvtColors.cpp" "src/c/imageProcessing/cvimgproc/imcvThresholds.cpp" "src/c/imageProcessing/cvimgproc/imcvAdaptThresholds.cpp" diff --git a/macros/scilab2c.bin b/macros/scilab2c.bin index 43191d55..cf35bf0b 100644 Binary files a/macros/scilab2c.bin and b/macros/scilab2c.bin differ diff --git a/macros/scilab2c.sci b/macros/scilab2c.sci index 8bdb667c..4fccb075 100644 --- a/macros/scilab2c.sci +++ b/macros/scilab2c.sci @@ -65,8 +65,8 @@ function scilab2c(varargin) return end end - if varargin(4) <> "All" & varargin(4) <> "Translate" & varargin(4) <> "GenLibraryStructure" & varargin(4) <> "FunCall" - error(msprintf(gettext("%s: argument #%d must be: ""All"", ""Translate"",""GenLibraryStructure"" or ""FunCall"".\n"),"scilab2c",4)); + if varargin(4) <> "All" & varargin(4) <> "Translate" & varargin(4) <> "GenLibraryStructure" + error(msprintf(gettext("%s: argument #%d must be: ""All"", ""Translate"",""GenLibraryStructure"".\n"),"scilab2c",4)); return end UserScilabMainFile = varargin(1); -- cgit