diff options
Diffstat (limited to 'macros')
343 files changed, 826 insertions, 128 deletions
diff --git a/macros/ASTManagement/%comment_string.bin b/macros/ASTManagement/%comment_string.bin Binary files differdeleted file mode 100644 index fb894945..00000000 --- a/macros/ASTManagement/%comment_string.bin +++ /dev/null diff --git a/macros/ASTManagement/%cste_string.bin b/macros/ASTManagement/%cste_string.bin Binary files differdeleted file mode 100644 index ba643c47..00000000 --- a/macros/ASTManagement/%cste_string.bin +++ /dev/null diff --git a/macros/ASTManagement/%equal_string.bin b/macros/ASTManagement/%equal_string.bin Binary files differdeleted file mode 100644 index 7f88fee6..00000000 --- a/macros/ASTManagement/%equal_string.bin +++ /dev/null diff --git a/macros/ASTManagement/%equal_string.sci b/macros/ASTManagement/%equal_string.sci index 9678f0e0..041fb84a 100644 --- a/macros/ASTManagement/%equal_string.sci +++ b/macros/ASTManagement/%equal_string.sci @@ -13,4 +13,4 @@ function txt=%equal_string(e) ' '+objectlist2string(e.lhs) 'EndEqual' ] -endfunction
\ No newline at end of file +endfunction diff --git a/macros/ASTManagement/%for_string.bin b/macros/ASTManagement/%for_string.bin Binary files differdeleted file mode 100644 index c3fda16b..00000000 --- a/macros/ASTManagement/%for_string.bin +++ /dev/null diff --git a/macros/ASTManagement/%funcall_string.bin b/macros/ASTManagement/%funcall_string.bin Binary files differdeleted file mode 100644 index 8354586d..00000000 --- a/macros/ASTManagement/%funcall_string.bin +++ /dev/null diff --git a/macros/ASTManagement/%ifthenel_string.bin b/macros/ASTManagement/%ifthenel_string.bin Binary files differdeleted file mode 100644 index 1c6fa73d..00000000 --- a/macros/ASTManagement/%ifthenel_string.bin +++ /dev/null diff --git a/macros/ASTManagement/%ifthenelse_string.bin b/macros/ASTManagement/%ifthenelse_string.bin Binary files differdeleted file mode 100644 index 456ffadc..00000000 --- a/macros/ASTManagement/%ifthenelse_string.bin +++ /dev/null diff --git a/macros/ASTManagement/%operatio_string.bin b/macros/ASTManagement/%operatio_string.bin Binary files differdeleted file mode 100644 index 40abf6b2..00000000 --- a/macros/ASTManagement/%operatio_string.bin +++ /dev/null diff --git a/macros/ASTManagement/%operatio_string.sci b/macros/ASTManagement/%operatio_string.sci index 8421a3f4..c0ecb478 100644 --- a/macros/ASTManagement/%operatio_string.sci +++ b/macros/ASTManagement/%operatio_string.sci @@ -4,10 +4,17 @@ function txt=%operatio_string(O) //fields: // operands: a list // operator: a string +if O.operator <> 'rc' txt=['Operation' ' Operands:' ' '+objectlist2string(O.operands) ' Operator: '+O.operator 'EndOperation' ] -endfunction
\ No newline at end of file +else + txt=[' Operands:' + ' '+objectlist2string(O.operands) + 'Endrc' + ] +end +endfunction diff --git a/macros/ASTManagement/%operation_string.bin b/macros/ASTManagement/%operation_string.bin Binary files differdeleted file mode 100644 index dfbeec96..00000000 --- a/macros/ASTManagement/%operation_string.bin +++ /dev/null diff --git a/macros/ASTManagement/%program_p.bin b/macros/ASTManagement/%program_p.bin Binary files differdeleted file mode 100644 index 216a38b2..00000000 --- a/macros/ASTManagement/%program_p.bin +++ /dev/null diff --git a/macros/ASTManagement/%program_string.bin b/macros/ASTManagement/%program_string.bin Binary files differdeleted file mode 100644 index 3a8fc95b..00000000 --- a/macros/ASTManagement/%program_string.bin +++ /dev/null diff --git a/macros/ASTManagement/%variable_string.bin b/macros/ASTManagement/%variable_string.bin Binary files differdeleted file mode 100644 index f81fd6e0..00000000 --- a/macros/ASTManagement/%variable_string.bin +++ /dev/null diff --git a/macros/ASTManagement/%while_string.bin b/macros/ASTManagement/%while_string.bin Binary files differdeleted file mode 100644 index 142189c6..00000000 --- a/macros/ASTManagement/%while_string.bin +++ /dev/null diff --git a/macros/ASTManagement/AST2Ccode.bin b/macros/ASTManagement/AST2Ccode.bin Binary files differdeleted file mode 100644 index e5e07800..00000000 --- a/macros/ASTManagement/AST2Ccode.bin +++ /dev/null diff --git a/macros/ASTManagement/AST2Ccode.sci b/macros/ASTManagement/AST2Ccode.sci index e3177be8..af07c5f1 100644 --- a/macros/ASTManagement/AST2Ccode.sci +++ b/macros/ASTManagement/AST2Ccode.sci @@ -46,6 +46,9 @@ ReportFileName = FileInfo.Funct(nxtscifunnumber).ReportFileName; // --------------------------------- // --- Parameter Initialization. --- // --------------------------------- +global rc_count +rc_count = 0; + global SCI2CSTACK SCI2CSTACK = ['EMPTYSTACK']; @@ -144,25 +147,45 @@ while ~meof(fidAST) //NUT: per fare in modo di coprire le ins, anche se ci puo' essere qualche rischio quando //NUT: ho miste ins e variabili, per esempio [c(1,1), a] = twooutfun(); //NUT: in questo caso solo una delle due equal va scartata. - [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,'Equal'); - SharedInfo = INIT_SharedInfoEqual(SharedInfo); + if rc_count > 0 + [FileInfo,SharedInfo] = AST_HandleFunRC(FileInfo,SharedInfo); + else + [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,'Equal'); + SharedInfo = INIT_SharedInfoEqual(SharedInfo); + end case 'Equal' then SharedInfo.Equal.Enabled = 1; // 1 means enabled -> we are inside an equal AST block. AST_PushASTStack(treeline); 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); - SharedInfo.Equal.InArg(tmpcnt).Scope = EqualInArgScope(tmpcnt); - end - AST_PushASTStack(treeline); + disp(rc_count); + if rc_count > 0 + SharedInfo.Equal.Lhs = 1; + [EqualInArgName,EqualInArgScope,EqualNInArg] = AST_HandleRC(FileInfo,SharedInfo); + SharedInfo.Equal.NInArg = EqualNInArg; + AST_PushASTStack(treeline); + for tmpcnt = 1:SharedInfo.Equal.NInArg + SharedInfo.Equal.InArg(tmpcnt).Name = EqualInArgName(tmpcnt); + SharedInfo.Equal.InArg(tmpcnt).Scope = EqualInArgScope(tmpcnt); + end + else + SharedInfo.Equal.Lhs = 1; // 1 means that we are inside the Lhs block of the Equal + //if SharedInfo.Equal.NOutArg > 0 + [EqualInArgName,EqualInArgScope,EqualNInArg] = AST_ReadEqualRhsNames(FileInfo,SharedInfo); + SharedInfo.Equal.NInArg = EqualNInArg; + //end + + // lengthNumber = length('Number_'); + // if (part(EqualInArgScope,1:lengthNumber) == 'Number_') + // SharedInfo.SkipNextEqual = 1 + // end + + for tmpcnt = 1:SharedInfo.Equal.NInArg + SharedInfo.Equal.InArg(tmpcnt).Name = EqualInArgName(tmpcnt); + SharedInfo.Equal.InArg(tmpcnt).Scope = EqualInArgScope(tmpcnt); + end + //end + AST_PushASTStack(treeline); + end // ---------------- // --- If/Else. --- @@ -229,6 +252,11 @@ while ~meof(fidAST) SharedInfo = AST_HandleEndWhile(FileInfo,SharedInfo); SharedInfo.While.Level = SharedInfo.While.Level - 1; + + case 'Endrc' then + rc_count = rc_count + 1; + //[FileInfo,SharedInfo] = AST_HandleRC(FileInfo,SharedInfo); + // ---------------- // --- Default. --- // ---------------- diff --git a/macros/ASTManagement/AST_CheckCommonInOutArgs.bin b/macros/ASTManagement/AST_CheckCommonInOutArgs.bin Binary files differdeleted file mode 100644 index 5c190ba3..00000000 --- a/macros/ASTManagement/AST_CheckCommonInOutArgs.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_CheckLastFunc.bin b/macros/ASTManagement/AST_CheckLastFunc.bin Binary files differdeleted file mode 100644 index 9cac2273..00000000 --- a/macros/ASTManagement/AST_CheckLastFunc.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_CheckLineLength.bin b/macros/ASTManagement/AST_CheckLineLength.bin Binary files differdeleted file mode 100644 index db486797..00000000 --- a/macros/ASTManagement/AST_CheckLineLength.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_CheckPrecSpecifier.bin b/macros/ASTManagement/AST_CheckPrecSpecifier.bin Binary files differdeleted file mode 100644 index 8e50397f..00000000 --- a/macros/ASTManagement/AST_CheckPrecSpecifier.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_DisplayStack.bin b/macros/ASTManagement/AST_DisplayStack.bin Binary files differdeleted file mode 100644 index 90cbcc74..00000000 --- a/macros/ASTManagement/AST_DisplayStack.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_ExtractNameAndScope.bin b/macros/ASTManagement/AST_ExtractNameAndScope.bin Binary files differdeleted file mode 100644 index 1944d88b..00000000 --- a/macros/ASTManagement/AST_ExtractNameAndScope.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_GetASTFile.bin b/macros/ASTManagement/AST_GetASTFile.bin Binary files differdeleted file mode 100644 index 261430e5..00000000 --- a/macros/ASTManagement/AST_GetASTFile.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_GetFuncallPrm.bin b/macros/ASTManagement/AST_GetFuncallPrm.bin Binary files differdeleted file mode 100644 index 37dbe771..00000000 --- a/macros/ASTManagement/AST_GetFuncallPrm.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_GetPrecAndLhsArg.bin b/macros/ASTManagement/AST_GetPrecAndLhsArg.bin Binary files differdeleted file mode 100644 index 71e44cb1..00000000 --- a/macros/ASTManagement/AST_GetPrecAndLhsArg.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_HandleEOL.bin b/macros/ASTManagement/AST_HandleEOL.bin Binary files differdeleted file mode 100644 index 3b6b3bd1..00000000 --- a/macros/ASTManagement/AST_HandleEOL.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_HandleEndFor.bin b/macros/ASTManagement/AST_HandleEndFor.bin Binary files differdeleted file mode 100644 index a6031b43..00000000 --- a/macros/ASTManagement/AST_HandleEndFor.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_HandleEndGenFun.bin b/macros/ASTManagement/AST_HandleEndGenFun.bin Binary files differdeleted file mode 100644 index 155a5b47..00000000 --- a/macros/ASTManagement/AST_HandleEndGenFun.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_HandleEndGenFun.sci b/macros/ASTManagement/AST_HandleEndGenFun.sci index e032bad2..7f551307 100644 --- a/macros/ASTManagement/AST_HandleEndGenFun.sci +++ b/macros/ASTManagement/AST_HandleEndGenFun.sci @@ -73,7 +73,14 @@ global STACKDEDUG // #RNU_RES_E [ASTFunName,InArg,NInArg,OutArg,NOutArg] = AST_GetFuncallPrm(FileInfo,SharedInfo,ASTFunType); NOutArg_mod = NOutArg - + if ASTFunName == 'OpLogAnd' + AST_PushASTStack('&&'); + return ; + end + if ASTFunName == 'OpLogOr' + AST_PushASTStack('||'); + return; + end if(mtlb_strcmp(part(ASTFunName,1:2),'CV') == %T) SharedInfo.OpenCVUsed = %T; end @@ -140,6 +147,7 @@ NOutArg_mod = NOutArg // --- Search for Equal Lhs and precision specifier to be applied to the current function. --- // ------------------------------------------------------------------------------------------- // #RNU_RES_E + PrintStringInfo(' no of out arguments' + string(NOutArg),ReportFileName,'file','y'); [LhsArg,NLhsArg,FunPrecSpecifier,SharedInfo] = AST_GetPrecAndLhsArg(OutArg,NOutArg,ASTFunName,FunTypeAnnot,FunSizeAnnot,ASTFunType,FileInfo,SharedInfo); //NUT: questa funzione contiene troppi parametri e mi sembra disordinata. @@ -337,8 +345,13 @@ NOutArg_mod = NOutArg OutArg(1).Name = string(OutArg(1).Value); elseif ((ASTFunName == 'double') & (NInArg == 1) & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number')) OutArg(1).Name = string(OutArg(1).Value); + //elseif ASTFunName == 'disp' else [OutArg,SharedInfo] = GenOutArgNames(ASTFunName,InArg,NInArg,OutArg,NOutArg,LhsArg,NLhsArg,FileInfo,SharedInfo); + if ( ASTFunName == 'OpLogGt' | ASTFunName == 'OpLogLt' | ASTFunName == 'OpLogLe' | ASTFunName == 'OpLogGe' | ASTFunName == 'OpLogNe' | ASTFunName == 'OpLogEq') + PrintStringInfo(' returning back due logical function',ReportFileName,'file','y'); + return; + end end if ((ASTFunName == 'uint8') & (NInArg == 1) & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number')) @@ -382,6 +395,8 @@ NOutArg_mod = NOutArg // Scope already set above. elseif (ASTFunName == 'double' & NInArg == 1 & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number')) // Scope already set above. + //elseif ASTFunName == 'disp' + //do nothing else OutArg = ST_AnalyzeScope(OutArg,NOutArg,FileInfo,SharedInfo); end @@ -400,6 +415,8 @@ NOutArg_mod = NOutArg //#RNUREM_ME A number is not inserted in the symbol table. elseif ((ASTFunName == 'double') & (NInArg == 1) & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number')) //#RNUREM_ME A number is not inserted in the symbol table. + //elseif ASTFunName == 'disp' + //do nothing else ST_InsOutArg(OutArg,NOutArg,FileInfo,SharedInfo,'all'); end @@ -432,10 +449,10 @@ NOutArg_mod = NOutArg // -------------------------------------------- //#RNU_RES_E //disp(OutArg,InArg,ASTFunName) - + CFunName = C_GenerateFunName(ASTFunName,InArg,NInArg,OutArg,NOutArg_mod); - + //#RNU_RES_B PrintStringInfo(' C Function Name: '+CFunName,ReportFileName,'file','y'); if(IsArduinoFunction(ASTFunName)) @@ -508,6 +525,8 @@ NOutArg_mod = NOutArg SharedInfo.SkipNextFun > 0 | ... ((sum(mtlb_strcmp(ASTFunName,SharedInfo.Annotations.DataPrec)) > 0) & (SharedInfo.SkipNextPrec == 1))) // Do nothing + //elseif ASTFunName == 'disp' + // Do nothing else AST_CheckCommonInOutArgs(InArg,NInArg,OutArg,NOutArg,ReportFileName); end diff --git a/macros/ASTManagement/AST_HandleEndProgram.bin b/macros/ASTManagement/AST_HandleEndProgram.bin Binary files differdeleted file mode 100644 index 5e02fdcd..00000000 --- a/macros/ASTManagement/AST_HandleEndProgram.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_HandleEndWhile.bin b/macros/ASTManagement/AST_HandleEndWhile.bin Binary files differdeleted file mode 100644 index bafccbc2..00000000 --- a/macros/ASTManagement/AST_HandleEndWhile.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_HandleFor.bin b/macros/ASTManagement/AST_HandleFor.bin Binary files differdeleted file mode 100644 index 27d44a12..00000000 --- a/macros/ASTManagement/AST_HandleFor.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_HandleForStatem.bin b/macros/ASTManagement/AST_HandleForStatem.bin Binary files differdeleted file mode 100644 index 4839b049..00000000 --- a/macros/ASTManagement/AST_HandleForStatem.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_HandleFunRC.sci b/macros/ASTManagement/AST_HandleFunRC.sci new file mode 100644 index 00000000..a70155a7 --- /dev/null +++ b/macros/ASTManagement/AST_HandleFunRC.sci @@ -0,0 +1,165 @@ +function [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo) +// function [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,ASTFunType) +// ----------------------------------------------------------------- +// #RNU_RES_B +// Handles the EndFuncall, EndOperation and EndEqual tags of the AST. +// ASTFunType can be 'Funcall', 'Operation', 'Equal' +// Structure of Funcall: +// overloading function for "funcall" type tlist string function +// this is a node of the AST +// fields: +// rhs : a list +// name : string, the name of the function +// lhsnb: number, the number of function lhs +// txt=['Funcall : '+F.name +// ' #lhs : '+string(F.lhsnb) +// ' Rhs : ' +// ' '+objectlist2string(F.rhs) +// 'EndFuncall' +// ] +// #RNU_RES_E +// +// Input data: +// //NUT: add description here +// +// Output data: +// //NUT: add description here +// +// Status: +// 11-Apr-2007 -- Raffaele Nutricato: Author. +// +// Copyright 2007 Raffaele Nutricato. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ + +// ----------------------- +// --- Initialization. --- +// ----------------------- +nxtscifunname = SharedInfo.NextSCIFunName; +nxtscifunnumber = SharedInfo.NextSCIFunNumber; +ReportFileName = FileInfo.Funct(nxtscifunnumber).ReportFileName; + +global SCI2CSTACK +global StackPosition; +global STACKDEDUG +// --------------------------- +// --- End Initialization. --- +// --------------------------- + +// ------------------------------ +// --- Read output parameters. -- +// ------------------------------ +LhsField = AST_PopASTStack(); +NOutArg = 0; +OutputArgumentNames = []; +OutputArgumentScope = []; +while (LhsField ~= 'Lhs :') + NOutArg = NOutArg + 1; + [OutputArgumentNames(NOutArg),OutputArgumentScope(NOutArg)] = AST_ExtractNameAndScope(LhsField); + LhsField = AST_PopASTStack(); + if (LhsField == 'Expression:') + error(9999, 'Found Expression: before Lhs'); + elseif (LhsField == 'Equal') + error(9999, 'Found Equal before Lhs'); + end +end + +// ------------------------------ +// --- Read input parameters. --- +// ------------------------------ + + +RhsField = AST_PopASTStack(); +NInArg = 0; +InArg = []; +while (RhsField ~= 'Expression:') + NInArg = NInArg + 1; + InArg(NInArg) = RhsField; + RhsField = AST_PopASTStack(); +end +InputArgumentNames = SCI2Cflipud(InputArgumentNames); +InputArgumentScope = SCI2Cflipud(InputArgumentScope); + + +// ------------------------------------- +// --- Generate the InArg structure. --- +// ------------------------------------- +//#RNU_RES_E +InArg = []; +for counterinputargs = 1:NInArg + InArg(counterinputargs).Name=InputArgumentNames(counterinputargs); + InArg(counterinputargs).Scope=InputArgumentScope(counterinputargs); +end + +//#RNU_RES_B +// ------------------------------------- +// --- Generate the InArg structure. --- +// ------------------------------------- +//#RNU_RES_E +OutArg = []; +for counteroutputargs = 1:NOutArg + OutArg(counteroutputargs).Name=OutputArgumentNames(counteroutputargs); + OutArg(counteroutputargs).Scope=OutputArgumentScope(counteroutputargs); +end + +// ------------------------ +// --- Print Some Info. --- +// ------------------------ + +PrintStringInfo('N Input Arguments: '+string(NInArg),ReportFileName,'file','y','n'); +PrintStringInfo('N Output Arguments: '+string(NOutArg),ReportFileName,'file','y'); + //#RNU_RES_E + for counterinputargs = 1:NInArg + //#RNU_RES_B + PrintStringInfo('Input Argument Number '+string(counterinputargs)+': '+InArg(counterinputargs).Name,... + ReportFileName,'file','y','n'); + PrintStringInfo(' Scope: '+InArg(counterinputargs).Scope,... + ReportFileName,'file','y','n'); + //#RNU_RES_E + end + for counteroutputargs = 1:NOutArg + //#RNU_RES_B + PrintStringInfo('Output Argument Number '+string(counteroutputargs)+': '+OutArg(counteroutputargs).Name,... + ReportFileName,'file','y','n'); + PrintStringInfo(' Scope: '+OutArg(counterinputargs).Scope,... + ReportFileName,'file','y','n'); + //#RNU_RES_E + end + +NOutArg_mod = NOutArg; + +FunTypeAnnot = ''; +FunSizeAnnot = ''; +NLhsArg = 0; +LhsArg = []; +PrintStringInfo('...Equal not found.',ReportFileName,'file','y'); + +PrintStringInfo('***Analyzing Input Arguments***',ReportFileName,'file','y'); +UpdatedInArg = InArg; +[InArg,SharedInfo] = ST_GetInArgInfo(InArg,NInArg,FileInfo,SharedInfo,'OpEqual'); + +size_count = 0; +for i = 1:NInArg + size_count = size_count + InArg(i).Size(2); +end + +PrintStringInfo(' Generating Out Arg names.',ReportFileName,'file','y'); +OutArg(1).Type = InArg(1).Type; +OutArg(1).Size(1) = '1' +OutArg(1).Size(2) = string(size_count); +OutArg(1).Dimension = InArg(1).Dimension; +OutArg(1).Value = InArg(1).Value; +OutArg(1).FindLike = InArg(1).FindLike; + +//--- Check for output Argument in symbol table ---// +OutArg = ST_AnalyzeScope(OutArg,NOutArg,FileInfo,SharedInfo); + +//--- Put the output Argument in symbol table ---// +ST_InsOutArg(OutArg,NOutArg,FileInfo,SharedInfo,'all'); + + +endfunction diff --git a/macros/ASTManagement/AST_HandleHeader.bin b/macros/ASTManagement/AST_HandleHeader.bin Binary files differdeleted file mode 100644 index 87ef763a..00000000 --- a/macros/ASTManagement/AST_HandleHeader.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_HandleIfElse.bin b/macros/ASTManagement/AST_HandleIfElse.bin Binary files differdeleted file mode 100644 index 343dd489..00000000 --- a/macros/ASTManagement/AST_HandleIfElse.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_HandleIfElse.sci b/macros/ASTManagement/AST_HandleIfElse.sci index 5373adf6..2b549ed6 100644 --- a/macros/ASTManagement/AST_HandleIfElse.sci +++ b/macros/ASTManagement/AST_HandleIfElse.sci @@ -74,11 +74,13 @@ global STACKDEDUG // --------------------------------------------------- //#RNU_RES_E if (ASTIfExpType~='else') - [IfCondArg,NIfCondArg] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType); + [IfCondArg,NIfCondArg,Op,NOp] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType); else // "else" type doesn't contain any condition to test. IfCondArg = ''; NIfCondArg = 0; + Op = ''; + NOp = 0; end //#RNU_RES_B @@ -87,6 +89,6 @@ end // ----------------------------- // --- Generate the C code for if/elseif Expression. --- //#RNU_RES_E -SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,ASTIfExpType,FileInfo,SharedInfo); +SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,Op,NOp,ASTIfExpType,FileInfo,SharedInfo); endfunction diff --git a/macros/ASTManagement/AST_HandleRC.sci b/macros/ASTManagement/AST_HandleRC.sci new file mode 100644 index 00000000..b1a1003f --- /dev/null +++ b/macros/ASTManagement/AST_HandleRC.sci @@ -0,0 +1,81 @@ +function [RhsNames,RhsScope,NRhs] = AST_ReadEqualRhsNames(FileInfo,SharedInfo) +// function [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,ASTFunType) +// ----------------------------------------------------------------- +// #RNU_RES_B +// Handles the EndFuncall, EndOperation and EndEqual tags of the AST. +// ASTFunType can be 'Funcall', 'Operation', 'Equal' +// Structure of Funcall: +// overloading function for "funcall" type tlist string function +// this is a node of the AST +// fields: +// rhs : a list +// name : string, the name of the function +// lhsnb: number, the number of function lhs +// txt=['Funcall : '+F.name +// ' #lhs : '+string(F.lhsnb) +// ' Rhs : ' +// ' '+objectlist2string(F.rhs) +// 'EndFuncall' +// ] +// #RNU_RES_E +// +// Input data: +// //NUT: add description here +// +// Output data: +// //NUT: add description here +// +// Status: +// 11-Apr-2007 -- Raffaele Nutricato: Author. +// +// Copyright 2007 Raffaele Nutricato. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +ReportFileName = FileInfo.Funct(nxtscifunnumber).ReportFileName; + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ + + +global SCI2CSTACK +global StackPosition; +global STACKDEDUG +// --------------------------- +// --- End Initialization. --- +// --------------------------- + + +// ------------------------------ +// --- Read input parameters. --- +// ------------------------------ +cntpop = 1; +NRhs = 0; +RhsField(cntpop) = AST_PopASTStack(); +RhsNames = []; +while (RhsField(cntpop) ~= 'Operands:') + NRhs = NRhs + 1; + [RhsNames(NRhs),RhsScope(NRhs)] = AST_ExtractNameAndScope(RhsField(cntpop)); + cntpop = cntpop + 1; + RhsField(cntpop) = AST_PopASTStack(); +end +RhsNames = SCI2Cflipud(RhsNames); +RhsScope = SCI2Cflipud(RhsScope); + +// --- Repush everything into the stack. --- +for cntpush = cntpop:-1:1 + AST_PushASTStack(RhsField(cntpush)); +end + + +for counterinputargs = 1:NRhs + //#RNU_RES_B + PrintStringInfo('Input Argument Number '+string(counterinputargs)+': '+InArg(counterinputargs).Name,... + ReportFileName,'file','y'); + PrintStringInfo(' Scope: '+InArg(counterinputargs).Scope,... + ReportFileName,'file','y'); + //#RNU_RES_E +end + +endfunction diff --git a/macros/ASTManagement/AST_HandleWhileExpr.bin b/macros/ASTManagement/AST_HandleWhileExpr.bin Binary files differdeleted file mode 100644 index 5f3da2de..00000000 --- a/macros/ASTManagement/AST_HandleWhileExpr.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_HandleWhileStatem.bin b/macros/ASTManagement/AST_HandleWhileStatem.bin Binary files differdeleted file mode 100644 index 3e9942c2..00000000 --- a/macros/ASTManagement/AST_HandleWhileStatem.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_HandleWhileStatem.sci b/macros/ASTManagement/AST_HandleWhileStatem.sci index 79fb516d..d8c2f73c 100644 --- a/macros/ASTManagement/AST_HandleWhileStatem.sci +++ b/macros/ASTManagement/AST_HandleWhileStatem.sci @@ -36,6 +36,8 @@ global SCI2CSTACK global StackPosition; global STACKDEDUG +IfCondArg = []; +NIfCondArg = 0; // ------------------------------ // --- Check input arguments. --- @@ -70,36 +72,40 @@ PrintStringInfo(' Redirecting C code to: '+FileInfo.Funct(nxtscifunnumber).CPa // --- Generate C code. --- // ------------------------ //#RNU_RES_E -if(SharedInfo.WhileExpr.CondVar == '') - //#RNU_RES_B - // It means that we are handling something like while(a) or while(1) - // The while condition variable is generated by the HandleEndGenFun. - //#RNU_RES_E - - // --- Pop the name of the condition variable or number. --- - Pop1 = AST_PopASTStack(); - - [ArgName,ArgScope] = AST_ExtractNameAndScope(Pop1); - if (length(ArgName) == 0) - PrintStringInfo(' ',ReportFileName,'both','y'); - PrintStringInfo('SCI2CERROR: Expected while(variable) or while(number).','','stdout','y'); - PrintStringInfo('SCI2CERROR: Expected a variable or number in the AST while expression.','','stdout','y'); - PrintStringInfo('SCI2CERROR: Report this error to http://forge.scilab.org/index.php/p/scilab2c/issues/.','','stdout','y'); - PrintStringInfo(' ',ReportFileName,'both','y'); - error(9999, 'Expected a conditional variable in the while expression'); +flagendpop = 0; +IfExprField = AST_PopASTStack(); + +NOp=0; +Op=[]; +while (flagendpop == 0) + if (IfExprField~='<EOL>') + if (IfExprField=='WhileExpression:') + flagendpop = 1; + // Pop Again the If tag from the AST. + IfExprField = AST_PopASTStack(); + elseif (IfExprField=='Operands:') + flagendpop = 0; + g = AST_PopASTStack(); + else + if (IfExprField=='&&' | IfExprField=='||') + NOp = NOp + 1; + Op(NOp) = IfExprField; + //PrintStringInfo('operators are '+Op(NOp),ReportFileName,'file','y'); + else + NIfCondArg = NIfCondArg + 1; + IfCondArg(NIfCondArg) = IfExprField; + end + //[IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField); + //[IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField); + end end + IfExprField = AST_PopASTStack(); + PrintStringInfo('operators are '+IfExprField,ReportFileName,'file','y'); +end - SharedInfo.WhileExpr.CondVar = ArgName; - //#RNU_RES_B - // --- Repush strings into the AST stack. --- - //#RNU_RES_E - - AST_PushASTStack(Pop1); +IfCondArg = SCI2Cflipud(IfCondArg); -elseif (SharedInfo.WhileExpr.DimCondVar > 0) - error(9999, 'Cannot manage while with matrix conditions'); -end -SharedInfo = C_WhileExpression(FileInfo,SharedInfo); +SharedInfo = C_WhileExpression(IfCondArg,NIfCondArg,Op,NOp,FileInfo,SharedInfo); // -------------------------- // --- Update SharedInfo. --- diff --git a/macros/ASTManagement/AST_ParseEqualStruct.bin b/macros/ASTManagement/AST_ParseEqualStruct.bin Binary files differdeleted file mode 100644 index 459c62e8..00000000 --- a/macros/ASTManagement/AST_ParseEqualStruct.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_ParseEqualStruct.sci b/macros/ASTManagement/AST_ParseEqualStruct.sci index fa76a01d..68bc3da7 100644 --- a/macros/ASTManagement/AST_ParseEqualStruct.sci +++ b/macros/ASTManagement/AST_ParseEqualStruct.sci @@ -123,7 +123,7 @@ end // ------------------------ //#RNU_RES_B PrintStringInfo('Function Name: '+FunctionName,ReportFileName,'file','y','n'); -PrintStringInfo('N Intput Arguments: '+string(NInArg),ReportFileName,'file','y','n'); +PrintStringInfo('N Input Arguments: '+string(NInArg),ReportFileName,'file','y','n'); //#RNU_RES_E if (SharedInfo.Equal.Nins > 0) //#RNU_RES_B diff --git a/macros/ASTManagement/AST_ParseFuncallStruct.bin b/macros/ASTManagement/AST_ParseFuncallStruct.bin Binary files differdeleted file mode 100644 index c9d996a0..00000000 --- a/macros/ASTManagement/AST_ParseFuncallStruct.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_ParseFuncallStruct.sci b/macros/ASTManagement/AST_ParseFuncallStruct.sci index 647a70d7..3c322dd5 100644 --- a/macros/ASTManagement/AST_ParseFuncallStruct.sci +++ b/macros/ASTManagement/AST_ParseFuncallStruct.sci @@ -87,6 +87,10 @@ NOutArg = eval(stripblanks(part(buffstring,10:length(buffstring)))); buffstring = AST_PopASTStack(); FunctionName = stripblanks(part(buffstring,12:length(buffstring))); +//if (FunctionName == 'disp') + // NOutArg = 0; +//end + // ------------------------------------- // --- Generate the InArg structure. --- // ------------------------------------- diff --git a/macros/ASTManagement/AST_ParseIfExprStruct.bin b/macros/ASTManagement/AST_ParseIfExprStruct.bin Binary files differdeleted file mode 100644 index cbf63413..00000000 --- a/macros/ASTManagement/AST_ParseIfExprStruct.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_ParseIfExprStruct.sci b/macros/ASTManagement/AST_ParseIfExprStruct.sci index a7da0128..3ed1b5b6 100644 --- a/macros/ASTManagement/AST_ParseIfExprStruct.sci +++ b/macros/ASTManagement/AST_ParseIfExprStruct.sci @@ -1,4 +1,4 @@ -function [IfCondArg,NIfCondArg] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType) +function [IfCondArg,NIfCondArg,Op,NOp] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType) // function [IfCondArg,NIfCondArg] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType) // ----------------------------------------------------------------- //#RNU_RES_B @@ -63,13 +63,26 @@ global STACKDEDUG // ------------------------------------ // --- Read if condition variables. --- // ------------------------------------ +//OutArgOld=[]; +//OutArgNew=[]; + +//for i = 1:3 + // OutArgOld(i)=AST_PopASTStack(); + //PrintStringInfo(' '+OutArgOld(i),ReportFileName,'file','y'); +//end +//x = AST_PopASTStack(); + +//OutArgNew = SCI2Cflipud(OutArgOld); + flagendpop = 0; IfExprField = AST_PopASTStack(); +PrintStringInfo(' '+IfExprField+' '+ASTIfExpType,ReportFileName,'file','y'); if (ASTIfExpType=='if') if (IfExprField=='Expression:') flagendpop = 1; // Pop Again the If tag from the AST. IfExprField = AST_PopASTStack(); + PrintStringInfo(' '+IfExprField,ReportFileName,'file','y'); end elseif (ASTIfExpType=='elseif') if (IfExprField=='Else If Expression') @@ -78,7 +91,8 @@ elseif (ASTIfExpType=='elseif') else error(9999, 'Unknown ASTIfExpType ""'+ASTIfExpType+'"".'); end - +NOp=0; +Op=[]; while (flagendpop == 0) if (IfExprField~='<EOL>') if (ASTIfExpType=='if') @@ -86,23 +100,41 @@ while (flagendpop == 0) flagendpop = 1; // Pop Again the If tag from the AST. IfExprField = AST_PopASTStack(); + elseif (IfExprField=='Operands:') + flagendpop = 0; + g = AST_PopASTStack(); else + if (IfExprField=='&&' | IfExprField=='||') + NOp = NOp + 1; + Op(NOp) = IfExprField; + //PrintStringInfo('operators are '+Op(NOp),ReportFileName,'file','y'); + else NIfCondArg = NIfCondArg + 1; - [IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField); + IfCondArg(NIfCondArg) = IfExprField; + end + //[IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField); end elseif (ASTIfExpType=='elseif') if (IfExprField=='Else If Expression') flagendpop = 1; else - NIfCondArg = NIfCondArg + 1; - IfCondArg(NIfCondArg) = IfExprField; - [IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField); + if (IfExprField=='&&') + NOp = NOp + 1; + Op(NOp) = IfExprField; + else + NIfCondArg = NIfCondArg + 1; + IfCondArg(NIfCondArg) = IfExprField; + end + //[IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField); end end end IfExprField = AST_PopASTStack(); + PrintStringInfo('operators are '+IfExprField,ReportFileName,'file','y'); end +IfCondArg = SCI2Cflipud(IfCondArg); + //#RNU_RES_B // ------------------------------------------- // --- Print some info in the report file. --- diff --git a/macros/ASTManagement/AST_ParseOperStruct.bin b/macros/ASTManagement/AST_ParseOperStruct.bin Binary files differdeleted file mode 100644 index eea4c288..00000000 --- a/macros/ASTManagement/AST_ParseOperStruct.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_ParseOperStruct.sci b/macros/ASTManagement/AST_ParseOperStruct.sci index a77317bd..903f0958 100644 --- a/macros/ASTManagement/AST_ParseOperStruct.sci +++ b/macros/ASTManagement/AST_ParseOperStruct.sci @@ -61,6 +61,17 @@ LabelFunctName = 'Operator: '; FunctionName = stripblanks(part(buffstring,length(LabelFunctName)+1:length(buffstring))); // Generate the proper function name. FunctionName = Operator2FunName(FunctionName); +PrintStringInfo(' '+FunctionName,ReportFileName,'file','y'); + +if (FunctionName == 'OpLogAnd' | FunctionName=='OpLogOr') + NInArg = 0; + NOutArg = 0; + InArg=[]; + //RhsField = AST_PopASTStack(); + //PrintStringInfo('hello'+RhsField,ReportFileName,'file','y'); + //RhsField = AST_PopASTStack(); + return ; +end // ------------------------------ // --- Read input parameters. --- diff --git a/macros/ASTManagement/AST_PopASTStack.bin b/macros/ASTManagement/AST_PopASTStack.bin Binary files differdeleted file mode 100644 index f9b85d34..00000000 --- a/macros/ASTManagement/AST_PopASTStack.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_PushASTStack.bin b/macros/ASTManagement/AST_PushASTStack.bin Binary files differdeleted file mode 100644 index 8fcd563c..00000000 --- a/macros/ASTManagement/AST_PushASTStack.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_ReadASTHeader.bin b/macros/ASTManagement/AST_ReadASTHeader.bin Binary files differdeleted file mode 100644 index 614231c4..00000000 --- a/macros/ASTManagement/AST_ReadASTHeader.bin +++ /dev/null diff --git a/macros/ASTManagement/AST_ReadEqualRhsNames.bin b/macros/ASTManagement/AST_ReadEqualRhsNames.bin Binary files differdeleted file mode 100644 index a131c498..00000000 --- a/macros/ASTManagement/AST_ReadEqualRhsNames.bin +++ /dev/null diff --git a/macros/ASTManagement/GenOutArgNames.bin b/macros/ASTManagement/GenOutArgNames.bin Binary files differdeleted file mode 100644 index c0d18341..00000000 --- a/macros/ASTManagement/GenOutArgNames.bin +++ /dev/null diff --git a/macros/ASTManagement/GenOutArgNames.sci b/macros/ASTManagement/GenOutArgNames.sci index 0e683835..7b62c794 100644 --- a/macros/ASTManagement/GenOutArgNames.sci +++ b/macros/ASTManagement/GenOutArgNames.sci @@ -32,6 +32,12 @@ SCI2CNInArgCheck(argn(2),9,9); nxtscifunname = SharedInfo.NextSCIFunName; nxtscifunnumber = SharedInfo.NextSCIFunNumber; ReportFileName = FileInfo.Funct(nxtscifunnumber).ReportFileName; + + +global SCI2CSTACK +global StackPosition; +global STACKDEDUG + // #RNU_RES_B PrintStringInfo(' Generating Out Arg names.',ReportFileName,'file','y'); // #RNU_RES_E @@ -43,47 +49,69 @@ OutArg = OldOutArg; // --------------------------------------------------------------------------------------- // At this step only the name of the output arguments can be generated. --- //#RNU_RES_E -if (NLhsArg > 0) - //#RNU_RES_B - // Use the equal Lhs names. - PrintStringInfo('Using Equal Lhs names.',ReportFileName,'file','y'); - //#RNU_RES_E - if (NLhsArg ~= NOutArg) - error(9999, 'NLhsArg='+string(NLhsArg)+' must be equal to NOutArg='+string(NOutArg)+'.'); - end - for counteroutputargs = 1:NOutArg - OutArg(counteroutputargs).Name=LhsArg(counteroutputargs).Name; - OutArg(counteroutputargs).Scope=LhsArg(counteroutputargs).Scope; - end +if (FunctionName ~= 'OpLogGt' & FunctionName ~= 'OpLogLt' & FunctionName ~= 'OpLogGe' & FunctionName ~= 'OpLogLe' & FunctionName ~= 'OpLogNe' & FunctionName ~= 'OpLogEq') + if (NLhsArg > 0) + //#RNU_RES_B + // Use the equal Lhs names. + PrintStringInfo('Using Equal Lhs names.',ReportFileName,'file','y'); + //#RNU_RES_E + if (NLhsArg ~= NOutArg) + error(9999, 'NLhsArg='+string(NLhsArg)+' must be equal to NOutArg='+string(NOutArg)+'.'); + end + for counteroutputargs = 1:NOutArg + OutArg(counteroutputargs).Name=LhsArg(counteroutputargs).Name; + OutArg(counteroutputargs).Scope=LhsArg(counteroutputargs).Scope; + end + else + //#RNU_RES_B + // Generate temporary variables. + PrintStringInfo('Generating temporary variables.',ReportFileName,'file','y'); + //#RNU_RES_E + if ((sum(mtlb_strcmp(FunctionName,SharedInfo.Annotations.DataPrec)) > 0) & ... + (SharedInfo.SkipNextPrec == 1)) + //#RNU_RES_B + PrintStringInfo(' Skipping code generating because already generated in the previous function.',ReportFileName,'file','y'); + //#RNU_RES_E + for counteroutputargs = 1:NOutArg + OutArg(counteroutputargs).Name = InArg(counteroutputargs).Name; + end + elseif (mtlb_strcmp(FunctionName,'OpEqual')) + // do nothing. + //NUT: verifica questa parte di codice. e' sicuro che se ho equal gli oldoutarg contengono gia' il nome? + else + for counteroutputargs = 1:NOutArg + if ((SharedInfo.ASTReader.EnableTempVarsReuse == 1) & ... + (length(SharedInfo.ASTReader.ReusableTempVars) > 0)) + TmpOutArgName = strcat([SharedInfo.ASTReader.TempVarsName,string(SharedInfo.ASTReader.ReusableTempVars(1))]); + SharedInfo.ASTReader.ReusableTempVars = SharedInfo.ASTReader.ReusableTempVars(2:$); + else + SharedInfo.ASTReader.UsedTempVars = SharedInfo.ASTReader.UsedTempVars + 1; + TmpOutArgName = strcat([SharedInfo.ASTReader.TempVarsName,string(SharedInfo.ASTReader.UsedTempVars)]); + end + OutArg(counteroutputargs).Name=TmpOutArgName; + end + end + end else - //#RNU_RES_B - // Generate temporary variables. - PrintStringInfo('Generating temporary variables.',ReportFileName,'file','y'); - //#RNU_RES_E - if ((sum(mtlb_strcmp(FunctionName,SharedInfo.Annotations.DataPrec)) > 0) & ... - (SharedInfo.SkipNextPrec == 1)) - //#RNU_RES_B - PrintStringInfo(' Skipping code generating because already generated in the previous function.',ReportFileName,'file','y'); - //#RNU_RES_E - for counteroutputargs = 1:NOutArg - OutArg(counteroutputargs).Name = InArg(counteroutputargs).Name; - end - elseif (mtlb_strcmp(FunctionName,'OpEqual')) - // do nothing. - //NUT: verifica questa parte di codice. e' sicuro che se ho equal gli oldoutarg contengono gia' il nome? - else - for counteroutputargs = 1:NOutArg - if ((SharedInfo.ASTReader.EnableTempVarsReuse == 1) & ... - (length(SharedInfo.ASTReader.ReusableTempVars) > 0)) - TmpOutArgName = strcat([SharedInfo.ASTReader.TempVarsName,string(SharedInfo.ASTReader.ReusableTempVars(1))]); - SharedInfo.ASTReader.ReusableTempVars = SharedInfo.ASTReader.ReusableTempVars(2:$); - else - SharedInfo.ASTReader.UsedTempVars = SharedInfo.ASTReader.UsedTempVars + 1; - TmpOutArgName = strcat([SharedInfo.ASTReader.TempVarsName,string(SharedInfo.ASTReader.UsedTempVars)]); - end - OutArg(counteroutputargs).Name=TmpOutArgName; - end - end + for counterinputargs = 1:NInArg + tmppushstack=InArg(counterinputargs).Name; + PrintStringInfo(' Pushing in the AST stack: ""'+tmppushstack+'"".',ReportFileName,'file','y'); + AST_PushASTStack(tmppushstack); + if FunctionName=='OpLogGt' + AST_PushASTStack('>'); + elseif FunctionName=='OpLogGe' + AST_PushASTStack('>='); + elseif FunctionName=='OpLogLt' + AST_PushASTStack('<'); + elseif FunctionName=='OpLogLe' + AST_PushASTStack('<='); + elseif FunctionName=='OpLogEq' + AST_PushASTStack('=='); + elseif FunctionName=='OpLogNe' + AST_PushASTStack('!='); + end + end + s = AST_PopASTStack(); + PrintStringInfo(' Pushing in the AST stack: ""'+s+'"".',ReportFileName,'file','y'); end - endfunction diff --git a/macros/ASTManagement/Operator2FunName.bin b/macros/ASTManagement/Operator2FunName.bin Binary files differdeleted file mode 100644 index 884c99bc..00000000 --- a/macros/ASTManagement/Operator2FunName.bin +++ /dev/null diff --git a/macros/ASTManagement/SciFile2ASTFile.bin b/macros/ASTManagement/SciFile2ASTFile.bin Binary files differdeleted file mode 100644 index be8bc0d5..00000000 --- a/macros/ASTManagement/SciFile2ASTFile.bin +++ /dev/null diff --git a/macros/ASTManagement/_comment_string.bin b/macros/ASTManagement/_comment_string.bin Binary files differdeleted file mode 100644 index fb894945..00000000 --- a/macros/ASTManagement/_comment_string.bin +++ /dev/null diff --git a/macros/ASTManagement/_cste_string.bin b/macros/ASTManagement/_cste_string.bin Binary files differdeleted file mode 100644 index ba643c47..00000000 --- a/macros/ASTManagement/_cste_string.bin +++ /dev/null diff --git a/macros/ASTManagement/_equal_string.bin b/macros/ASTManagement/_equal_string.bin Binary files differdeleted file mode 100644 index 7f88fee6..00000000 --- a/macros/ASTManagement/_equal_string.bin +++ /dev/null diff --git a/macros/ASTManagement/_for_string.bin b/macros/ASTManagement/_for_string.bin Binary files differdeleted file mode 100644 index c3fda16b..00000000 --- a/macros/ASTManagement/_for_string.bin +++ /dev/null diff --git a/macros/ASTManagement/_funcall_string.bin b/macros/ASTManagement/_funcall_string.bin Binary files differdeleted file mode 100644 index 8354586d..00000000 --- a/macros/ASTManagement/_funcall_string.bin +++ /dev/null diff --git a/macros/ASTManagement/_ifthenel_string.bin b/macros/ASTManagement/_ifthenel_string.bin Binary files differdeleted file mode 100644 index 1c6fa73d..00000000 --- a/macros/ASTManagement/_ifthenel_string.bin +++ /dev/null diff --git a/macros/ASTManagement/_ifthenelse_string.bin b/macros/ASTManagement/_ifthenelse_string.bin Binary files differdeleted file mode 100644 index 456ffadc..00000000 --- a/macros/ASTManagement/_ifthenelse_string.bin +++ /dev/null diff --git a/macros/ASTManagement/_operatio_string.bin b/macros/ASTManagement/_operatio_string.bin Binary files differdeleted file mode 100644 index 40abf6b2..00000000 --- a/macros/ASTManagement/_operatio_string.bin +++ /dev/null diff --git a/macros/ASTManagement/_operation_string.bin b/macros/ASTManagement/_operation_string.bin Binary files differdeleted file mode 100644 index dfbeec96..00000000 --- a/macros/ASTManagement/_operation_string.bin +++ /dev/null diff --git a/macros/ASTManagement/_program_p.bin b/macros/ASTManagement/_program_p.bin Binary files differdeleted file mode 100644 index 216a38b2..00000000 --- a/macros/ASTManagement/_program_p.bin +++ /dev/null diff --git a/macros/ASTManagement/_program_string.bin b/macros/ASTManagement/_program_string.bin Binary files differdeleted file mode 100644 index 3a8fc95b..00000000 --- a/macros/ASTManagement/_program_string.bin +++ /dev/null diff --git a/macros/ASTManagement/_variable_string.bin b/macros/ASTManagement/_variable_string.bin Binary files differdeleted file mode 100644 index f81fd6e0..00000000 --- a/macros/ASTManagement/_variable_string.bin +++ /dev/null diff --git a/macros/ASTManagement/_while_string.bin b/macros/ASTManagement/_while_string.bin Binary files differdeleted file mode 100644 index 142189c6..00000000 --- a/macros/ASTManagement/_while_string.bin +++ /dev/null diff --git a/macros/ASTManagement/lib b/macros/ASTManagement/lib Binary files differindex 908366b7..67ea09be 100644 --- a/macros/ASTManagement/lib +++ b/macros/ASTManagement/lib diff --git a/macros/ASTManagement/names b/macros/ASTManagement/names index a1aafbc1..26edaf7c 100644 --- a/macros/ASTManagement/names +++ b/macros/ASTManagement/names @@ -28,8 +28,10 @@ AST_HandleEndProgram AST_HandleEndWhile AST_HandleFor AST_HandleForStatem +AST_HandleFunRC AST_HandleHeader AST_HandleIfElse +AST_HandleRC AST_HandleWhileExpr AST_HandleWhileStatem AST_ParseEqualStruct @@ -57,3 +59,5 @@ _program_string _variable_string _while_string objectlist2string +AST_HandleRC +AST_HandleFunRC diff --git a/macros/ASTManagement/objectlist2string.bin b/macros/ASTManagement/objectlist2string.bin Binary files differdeleted file mode 100644 index 96159f22..00000000 --- a/macros/ASTManagement/objectlist2string.bin +++ /dev/null diff --git a/macros/CCodeGeneration/C_FinalizeCode.bin b/macros/CCodeGeneration/C_FinalizeCode.bin Binary files differdeleted file mode 100644 index b4005914..00000000 --- a/macros/CCodeGeneration/C_FinalizeCode.bin +++ /dev/null diff --git a/macros/CCodeGeneration/C_ForExpression.bin b/macros/CCodeGeneration/C_ForExpression.bin Binary files differdeleted file mode 100644 index 1c3f6747..00000000 --- a/macros/CCodeGeneration/C_ForExpression.bin +++ /dev/null diff --git a/macros/CCodeGeneration/C_Funcall.bin b/macros/CCodeGeneration/C_Funcall.bin Binary files differdeleted file mode 100644 index 80fda7c4..00000000 --- a/macros/CCodeGeneration/C_Funcall.bin +++ /dev/null diff --git a/macros/CCodeGeneration/C_GenDeclarations.bin b/macros/CCodeGeneration/C_GenDeclarations.bin Binary files differdeleted file mode 100644 index c3b36009..00000000 --- a/macros/CCodeGeneration/C_GenDeclarations.bin +++ /dev/null diff --git a/macros/CCodeGeneration/C_GenerateFunName.bin b/macros/CCodeGeneration/C_GenerateFunName.bin Binary files differdeleted file mode 100644 index 1b723f16..00000000 --- a/macros/CCodeGeneration/C_GenerateFunName.bin +++ /dev/null diff --git a/macros/CCodeGeneration/C_GenerateLaunchScript.bin b/macros/CCodeGeneration/C_GenerateLaunchScript.bin Binary files differdeleted file mode 100644 index 587c1547..00000000 --- a/macros/CCodeGeneration/C_GenerateLaunchScript.bin +++ /dev/null diff --git a/macros/CCodeGeneration/C_GenerateMakefile.bin b/macros/CCodeGeneration/C_GenerateMakefile.bin Binary files differdeleted file mode 100644 index cea86411..00000000 --- a/macros/CCodeGeneration/C_GenerateMakefile.bin +++ /dev/null diff --git a/macros/CCodeGeneration/C_GenerateMakefile_msvc.bin b/macros/CCodeGeneration/C_GenerateMakefile_msvc.bin Binary files differdeleted file mode 100644 index 838c674e..00000000 --- a/macros/CCodeGeneration/C_GenerateMakefile_msvc.bin +++ /dev/null diff --git a/macros/CCodeGeneration/C_GenerateSCI2CHeader.bin b/macros/CCodeGeneration/C_GenerateSCI2CHeader.bin Binary files differdeleted file mode 100644 index 2e02cae4..00000000 --- a/macros/CCodeGeneration/C_GenerateSCI2CHeader.bin +++ /dev/null diff --git a/macros/CCodeGeneration/C_IfElseBlocks.bin b/macros/CCodeGeneration/C_IfElseBlocks.bin Binary files differdeleted file mode 100644 index 332e89bf..00000000 --- a/macros/CCodeGeneration/C_IfElseBlocks.bin +++ /dev/null diff --git a/macros/CCodeGeneration/C_IfExpression.bin b/macros/CCodeGeneration/C_IfExpression.bin Binary files differdeleted file mode 100644 index c6cda7bd..00000000 --- a/macros/CCodeGeneration/C_IfExpression.bin +++ /dev/null diff --git a/macros/CCodeGeneration/C_IfExpression.sci b/macros/CCodeGeneration/C_IfExpression.sci index 48a05383..c723d95a 100644 --- a/macros/CCodeGeneration/C_IfExpression.sci +++ b/macros/CCodeGeneration/C_IfExpression.sci @@ -1,4 +1,4 @@ -function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,ASTIfExpType,FileInfo,SharedInfo) +function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,Op,NOp,ASTIfExpType,FileInfo,SharedInfo) // function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,ASTIfExpType,FileInfo,SharedInfo) // ----------------------------------------------------------------- // //NUT: add description here @@ -19,12 +19,16 @@ function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,ASTIfExpType,FileInfo, // ------------------------------ // --- Check input arguments. --- // ------------------------------ -SCI2CNInArgCheck(argn(2),5,5); +//SCI2CNInArgCheck(argn(4),7,7); + +//global SCI2CSTACK +//global StackPosition; +//global STACKDEDUG // --- Check NIfCondArg value. --- -if ((NIfCondArg ~= 1) & (ASTIfExpType~='else')) - error(9999, 'Cannot manage ""if/elseif"" with a number of condition variables not equal to 1.'); -end +//if ((NIfCondArg ~= 1) & (ASTIfExpType~='else')) + // error(9999, 'Cannot manage ""if/elseif"" with a number of condition variables not equal to 1.'); +//end // ----------------------- // --- Initialization. --- @@ -37,7 +41,7 @@ CPass1FileName = FileInfo.Funct(nxtscifunnumber).CPass1FileName; // #RNU_RES_B PrintStringInfo(' ',ReportFileName,'file','y'); -PrintStringInfo('***Generating C code***',ReportFileName,'file','y'); +PrintStringInfo('***Generating C code***'+ string(NIfCondArg),ReportFileName,'file','y'); // #RNU_RES_E // --------------------------- // --- End Initialization. --- @@ -66,10 +70,23 @@ if SCI2Cstrncmps1size(ASTIfExpType,'else') SharedInfo = C_IfElseBlocks(FileInfo,SharedInfo,'out'); end +i=1; +k=1; CCall =''; CCall = CCall+CFunName; if (ASTIfExpType~='else') - CCall = CCall+'('+IfCondArg(1)+')'; + CCall = CCall+'('; + while i <= NIfCondArg + CCall = CCall + IfCondArg(i) + ' '; + //d = modulo(i,3); + //PrintStringInfo(' '+string(i)+string(d),'file','y'); + if (modulo(i,3)==0 & i<>NIfCondArg) + CCall = CCall + Op(k) + ' '; + k = k + 1; + end + i = i + 1; + end + CCall = CCall+')'; end PrintStringInfo(' '+CCall,ReportFileName,'file','y'); PrintStringInfo(C_IndentBlanks(SharedInfo.NIndent)+CCall,CPass1FileName,'file','y'); diff --git a/macros/CCodeGeneration/C_IndentBlanks.bin b/macros/CCodeGeneration/C_IndentBlanks.bin Binary files differdeleted file mode 100644 index 77bfaebc..00000000 --- a/macros/CCodeGeneration/C_IndentBlanks.bin +++ /dev/null diff --git a/macros/CCodeGeneration/C_InitHeader.bin b/macros/CCodeGeneration/C_InitHeader.bin Binary files differdeleted file mode 100644 index 567822c0..00000000 --- a/macros/CCodeGeneration/C_InitHeader.bin +++ /dev/null diff --git a/macros/CCodeGeneration/C_MemAllocOutTempVars.bin b/macros/CCodeGeneration/C_MemAllocOutTempVars.bin Binary files differdeleted file mode 100644 index 443ad3c1..00000000 --- a/macros/CCodeGeneration/C_MemAllocOutTempVars.bin +++ /dev/null diff --git a/macros/CCodeGeneration/C_SCI2CHeader.bin b/macros/CCodeGeneration/C_SCI2CHeader.bin Binary files differdeleted file mode 100644 index 1d3e6182..00000000 --- a/macros/CCodeGeneration/C_SCI2CHeader.bin +++ /dev/null diff --git a/macros/CCodeGeneration/C_Type.bin b/macros/CCodeGeneration/C_Type.bin Binary files differdeleted file mode 100644 index 7b5bf444..00000000 --- a/macros/CCodeGeneration/C_Type.bin +++ /dev/null diff --git a/macros/CCodeGeneration/C_WhileExpression.bin b/macros/CCodeGeneration/C_WhileExpression.bin Binary files differdeleted file mode 100644 index cff8f38d..00000000 --- a/macros/CCodeGeneration/C_WhileExpression.bin +++ /dev/null diff --git a/macros/CCodeGeneration/C_WhileExpression.sci b/macros/CCodeGeneration/C_WhileExpression.sci index edd2830e..d7cf70ec 100644 --- a/macros/CCodeGeneration/C_WhileExpression.sci +++ b/macros/CCodeGeneration/C_WhileExpression.sci @@ -1,4 +1,4 @@ -function SharedInfo = C_WhileExpression(FileInfo,SharedInfo) +function SharedInfo = C_WhileExpression(IfCondArg,NIfCondArg,Op,NOp,FileInfo,SharedInfo) // function SharedInfo = C_WhileExpression(FileInfo,SharedInfo) // ----------------------------------------------------------------- // //NUT: add description here @@ -19,7 +19,7 @@ function SharedInfo = C_WhileExpression(FileInfo,SharedInfo) // ------------------------------ // --- Check input arguments. --- // ------------------------------ -SCI2CNInArgCheck(argn(2),2,2); +//SCI2CNInArgCheck(argn(2),2,2); // ----------------------- // --- Initialization. --- @@ -63,7 +63,7 @@ for cntstr = 1:NumCStrings // Epilogue if (length(C_Strings(cntstr)) == 0) C_Strings(cntstr) = ' '; // RNU for Bruno: If I don't do that I get a PrintStringInfo error related to mputstr. - // Function not defined for given argument type(s),
+ // Function not defined for given argument type(s), // check arguments or define function %0_mputstr for overloading. end PrintStringInfo(C_Strings(cntstr),CPass1WhileEpilFileName ,'file','y','n'); @@ -76,7 +76,27 @@ PrintStringInfo('}',CPass1WhileEpilFileName ,'file','y'); // ------------------------------ // --- Insert for expression. --- // ------------------------------ -CCall = 'while('+SharedInfo.WhileExpr.CondVar+')'; +//CCall = 'while('+SharedInfo.WhileExpr.CondVar+')'; +//PrintStringInfo(C_IndentBlanks(SharedInfo.NIndent)+CCall,CPass1FileName,'file','y'); + +i=1; +k=1; +CCall =''; +CCall = CCall+'while'; + CCall = CCall+'('; + while i <= NIfCondArg + CCall = CCall + IfCondArg(i) + ' '; + //d = modulo(i,3); + //PrintStringInfo(' '+string(i)+string(d),'file','y'); + if (modulo(i,3)==0 & i<>NIfCondArg) + CCall = CCall + Op(k) + ' '; + k = k + 1; + end + i = i + 1; + end + CCall = CCall+')'; + +PrintStringInfo(' '+CCall,ReportFileName,'file','y'); PrintStringInfo(C_IndentBlanks(SharedInfo.NIndent)+CCall,CPass1FileName,'file','y'); // ------------------- diff --git a/macros/CCodeGeneration/GenCFunDatFiles.bin b/macros/CCodeGeneration/GenCFunDatFiles.bin Binary files differdeleted file mode 100644 index 6a374f5b..00000000 --- a/macros/CCodeGeneration/GenCFunDatFiles.bin +++ /dev/null diff --git a/macros/CCodeGeneration/GetClsFileName.bin b/macros/CCodeGeneration/GetClsFileName.bin Binary files differdeleted file mode 100644 index 30b25713..00000000 --- a/macros/CCodeGeneration/GetClsFileName.bin +++ /dev/null diff --git a/macros/CCodeGeneration/GetClsFileName.sci b/macros/CCodeGeneration/GetClsFileName.sci index 46f08201..d92a431c 100644 --- a/macros/CCodeGeneration/GetClsFileName.sci +++ b/macros/CCodeGeneration/GetClsFileName.sci @@ -45,6 +45,7 @@ if SCI2Cfileexist(FileInfo.USER2CLibCAnnFun,tmpannfilename) // #RNU_RES_B // It is a C function of the USER2C library. // #RNU_RES_E + PrintStringInfo('cUser2c',ReportFileName,'file','y'); FlagFoundAnnFile = 1; AnnFileName = fullfile(FileInfo.USER2CLibCAnnFun,tmpannfilename); SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName); @@ -53,6 +54,7 @@ elseif SCI2Cfileexist(FileInfo.USER2CLibSCIAnnFun,tmpannfilename) // #RNU_RES_B // It is a scilab function of the USER2C library. // #RNU_RES_E + PrintStringInfo('fUser2c',ReportFileName,'file','y'); FlagFoundAnnFile = 1; AnnFileName = fullfile(FileInfo.USER2CLibSCIAnnFun,tmpannfilename); SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName); @@ -61,6 +63,7 @@ elseif (SCI2Cfileexist(FileInfo.SCI2CLibCAnnFun,tmpannfilename)) // #RNU_RES_B // It is a C function of the SCI2C library. // #RNU_RES_E + PrintStringInfo('csci2c',ReportFileName,'file','y'); FlagFoundAnnFile = 1; AnnFileName = fullfile(FileInfo.SCI2CLibCAnnFun,tmpannfilename); SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName); @@ -69,6 +72,7 @@ elseif (SCI2Cfileexist(FileInfo.SCI2CLibSCIAnnFun,tmpannfilename)) // #RNU_RES_B // It is a scilab function of the SCI2C library. // #RNU_RES_E + PrintStringInfo('fsci2c',ReportFileName,'file','y'); FlagFoundAnnFile = 1; AnnFileName = fullfile(FileInfo.SCI2CLibSCIAnnFun,tmpannfilename); SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName); diff --git a/macros/CCodeGeneration/GetSymbolDimension.bin b/macros/CCodeGeneration/GetSymbolDimension.bin Binary files differdeleted file mode 100644 index 5c73f435..00000000 --- a/macros/CCodeGeneration/GetSymbolDimension.bin +++ /dev/null diff --git a/macros/CCodeGeneration/GetWhileCondVariable.bin b/macros/CCodeGeneration/GetWhileCondVariable.bin Binary files differdeleted file mode 100644 index 6815fb4b..00000000 --- a/macros/CCodeGeneration/GetWhileCondVariable.bin +++ /dev/null diff --git a/macros/CCodeGeneration/JoinDeclarAndCcode.bin b/macros/CCodeGeneration/JoinDeclarAndCcode.bin Binary files differdeleted file mode 100644 index 084ab085..00000000 --- a/macros/CCodeGeneration/JoinDeclarAndCcode.bin +++ /dev/null diff --git a/macros/CCodeGeneration/Sci2AnnotationFile.bin b/macros/CCodeGeneration/Sci2AnnotationFile.bin Binary files differdeleted file mode 100644 index 95fe5611..00000000 --- a/macros/CCodeGeneration/Sci2AnnotationFile.bin +++ /dev/null diff --git a/macros/CCodeGeneration/lib b/macros/CCodeGeneration/lib Binary files differindex 0149d795..2db4b8c8 100644 --- a/macros/CCodeGeneration/lib +++ b/macros/CCodeGeneration/lib diff --git a/macros/CCodeGeneration/names b/macros/CCodeGeneration/names index 5311c7fd..4d76299e 100644 --- a/macros/CCodeGeneration/names +++ b/macros/CCodeGeneration/names @@ -13,6 +13,7 @@ C_IfExpression C_IndentBlanks C_InitHeader C_MemAllocOutTempVars +C_RCOperator C_SCI2CHeader C_Type C_WhileExpression diff --git a/macros/ErrorMessages/EM_NanSize.bin b/macros/ErrorMessages/EM_NanSize.bin Binary files differdeleted file mode 100644 index d0ad584b..00000000 --- a/macros/ErrorMessages/EM_NanSize.bin +++ /dev/null diff --git a/macros/ErrorMessages/EM_UnknownStep.bin b/macros/ErrorMessages/EM_UnknownStep.bin Binary files differdeleted file mode 100644 index 57a2b4d7..00000000 --- a/macros/ErrorMessages/EM_UnknownStep.bin +++ /dev/null diff --git a/macros/ErrorMessages/EM_ZeroSize.bin b/macros/ErrorMessages/EM_ZeroSize.bin Binary files differdeleted file mode 100644 index f8d2830f..00000000 --- a/macros/ErrorMessages/EM_ZeroSize.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_ADD.bin b/macros/FunctionAnnotation/FA_ADD.bin Binary files differdeleted file mode 100644 index 6c810828..00000000 --- a/macros/FunctionAnnotation/FA_ADD.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_DIV.bin b/macros/FunctionAnnotation/FA_DIV.bin Binary files differdeleted file mode 100644 index 6e6708fe..00000000 --- a/macros/FunctionAnnotation/FA_DIV.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_FSFIRLIN_SZ.bin b/macros/FunctionAnnotation/FA_FSFIRLIN_SZ.bin Binary files differdeleted file mode 100644 index 7e15d2bc..00000000 --- a/macros/FunctionAnnotation/FA_FSFIRLIN_SZ.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin b/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin Binary files differdeleted file mode 100644 index fa48e833..00000000 --- a/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_GetFunAnn.bin b/macros/FunctionAnnotation/FA_GetFunAnn.bin Binary files differdeleted file mode 100644 index b38770ee..00000000 --- a/macros/FunctionAnnotation/FA_GetFunAnn.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_GetFunAnn.sci b/macros/FunctionAnnotation/FA_GetFunAnn.sci index d11e3cee..3fadd1f2 100644 --- a/macros/FunctionAnnotation/FA_GetFunAnn.sci +++ b/macros/FunctionAnnotation/FA_GetFunAnn.sci @@ -52,7 +52,7 @@ FunSizeAnnot = ''; // ---------------------------------------------
// --- Open the .sci file (read only). ---
inclsfid = SCI2COpenFileRead(SCI2CClassFileName);
-
+PrintStringInfo(' '+string(inclsfid),ReportFileName,'file','y');
// #RNU_RES_B
// --- Loop over the lines of the input file. ---
// Position file pointer to the desired NInArg/NOutArg section,
@@ -212,5 +212,6 @@ mclose(inclsfid); // -------------------------------------------------
// --- End Read the annotations of the function. ---
// -------------------------------------------------
+PrintStringInfo(' end of annotation '+string(NOutArg_mod),ReportFileName,'file','y');
endfunction
diff --git a/macros/FunctionAnnotation/FA_GetOutArgInfo.bin b/macros/FunctionAnnotation/FA_GetOutArgInfo.bin Binary files differdeleted file mode 100644 index 89c0d1d3..00000000 --- a/macros/FunctionAnnotation/FA_GetOutArgInfo.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_GetResizeApproach.bin b/macros/FunctionAnnotation/FA_GetResizeApproach.bin Binary files differdeleted file mode 100644 index 77397e01..00000000 --- a/macros/FunctionAnnotation/FA_GetResizeApproach.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_INT.bin b/macros/FunctionAnnotation/FA_INT.bin Binary files differdeleted file mode 100644 index edf9bb84..00000000 --- a/macros/FunctionAnnotation/FA_INT.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_MAX.bin b/macros/FunctionAnnotation/FA_MAX.bin Binary files differdeleted file mode 100644 index a9debbab..00000000 --- a/macros/FunctionAnnotation/FA_MAX.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_MIN.bin b/macros/FunctionAnnotation/FA_MIN.bin Binary files differdeleted file mode 100644 index cc9bd02e..00000000 --- a/macros/FunctionAnnotation/FA_MIN.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_MUL.bin b/macros/FunctionAnnotation/FA_MUL.bin Binary files differdeleted file mode 100644 index 8b674c21..00000000 --- a/macros/FunctionAnnotation/FA_MUL.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_REAL.bin b/macros/FunctionAnnotation/FA_REAL.bin Binary files differdeleted file mode 100644 index ed68eb74..00000000 --- a/macros/FunctionAnnotation/FA_REAL.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SCHUR_SZ.bin b/macros/FunctionAnnotation/FA_SCHUR_SZ.bin Binary files differdeleted file mode 100644 index 292a6193..00000000 --- a/macros/FunctionAnnotation/FA_SCHUR_SZ.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SCHUR_TP.bin b/macros/FunctionAnnotation/FA_SCHUR_TP.bin Binary files differdeleted file mode 100644 index 4b0b438f..00000000 --- a/macros/FunctionAnnotation/FA_SCHUR_TP.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SUB.bin b/macros/FunctionAnnotation/FA_SUB.bin Binary files differdeleted file mode 100644 index fdc52b4d..00000000 --- a/macros/FunctionAnnotation/FA_SUB.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_1.bin b/macros/FunctionAnnotation/FA_SZ_1.bin Binary files differdeleted file mode 100644 index c01ff59d..00000000 --- a/macros/FunctionAnnotation/FA_SZ_1.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_2.bin b/macros/FunctionAnnotation/FA_SZ_2.bin Binary files differdeleted file mode 100644 index 00834df4..00000000 --- a/macros/FunctionAnnotation/FA_SZ_2.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin b/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin Binary files differdeleted file mode 100644 index a3b34afc..00000000 --- a/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin b/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin Binary files differdeleted file mode 100644 index 76748237..00000000 --- a/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin b/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin Binary files differdeleted file mode 100644 index 879c5885..00000000 --- a/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin b/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin Binary files differdeleted file mode 100644 index af9d1cb8..00000000 --- a/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin b/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin Binary files differdeleted file mode 100644 index ddabb108..00000000 --- a/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin b/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin Binary files differdeleted file mode 100644 index be386e03..00000000 --- a/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_DIFF.bin b/macros/FunctionAnnotation/FA_SZ_DIFF.bin Binary files differdeleted file mode 100644 index 08d66c13..00000000 --- a/macros/FunctionAnnotation/FA_SZ_DIFF.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_FACTOR.bin b/macros/FunctionAnnotation/FA_SZ_FACTOR.bin Binary files differdeleted file mode 100644 index ee8f8991..00000000 --- a/macros/FunctionAnnotation/FA_SZ_FACTOR.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin b/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin Binary files differdeleted file mode 100644 index a06f3b16..00000000 --- a/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin b/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin Binary files differdeleted file mode 100644 index 60cb9d4e..00000000 --- a/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_LQE.bin b/macros/FunctionAnnotation/FA_SZ_LQE.bin Binary files differdeleted file mode 100644 index 8abfa39b..00000000 --- a/macros/FunctionAnnotation/FA_SZ_LQE.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_LQR.bin b/macros/FunctionAnnotation/FA_SZ_LQR.bin Binary files differdeleted file mode 100644 index 843fb2ce..00000000 --- a/macros/FunctionAnnotation/FA_SZ_LQR.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_MODSN.bin b/macros/FunctionAnnotation/FA_SZ_MODSN.bin Binary files differdeleted file mode 100644 index 601eb564..00000000 --- a/macros/FunctionAnnotation/FA_SZ_MODSN.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin b/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin Binary files differdeleted file mode 100644 index b936e29c..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin b/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin Binary files differdeleted file mode 100644 index 90e50348..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.bin b/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.bin Binary files differdeleted file mode 100644 index be3e89ac..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPCC.bin b/macros/FunctionAnnotation/FA_SZ_OPCC.bin Binary files differdeleted file mode 100644 index 767385a3..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPCC.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin b/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin Binary files differdeleted file mode 100644 index 822cb5e8..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin b/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin Binary files differdeleted file mode 100644 index 2af7e390..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin b/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin Binary files differdeleted file mode 100644 index 72d6e23d..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin b/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin Binary files differdeleted file mode 100644 index f060e87e..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin b/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin Binary files differdeleted file mode 100644 index 6be9a457..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPHAT.bin b/macros/FunctionAnnotation/FA_SZ_OPHAT.bin Binary files differdeleted file mode 100644 index feb8122d..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPHAT.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin b/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin Binary files differdeleted file mode 100644 index e4419128..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin b/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin Binary files differdeleted file mode 100644 index afe431b3..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin b/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin Binary files differdeleted file mode 100644 index 87d2d5bf..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin b/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin Binary files differdeleted file mode 100644 index c3a1d88c..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin b/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin Binary files differdeleted file mode 100644 index 80216050..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin b/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin Binary files differdeleted file mode 100644 index 417fe265..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin b/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin Binary files differdeleted file mode 100644 index 6c9f9bf0..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin b/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin Binary files differdeleted file mode 100644 index 417a9195..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin b/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin Binary files differdeleted file mode 100644 index af6c2a8e..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin b/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin Binary files differdeleted file mode 100644 index deac97df..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin b/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin Binary files differdeleted file mode 100644 index da84349d..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin b/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin Binary files differdeleted file mode 100644 index b45ac592..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPRC.bin b/macros/FunctionAnnotation/FA_SZ_OPRC.bin Binary files differdeleted file mode 100644 index 6d55e274..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPRC.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin b/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin Binary files differdeleted file mode 100644 index 14bb17f9..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin b/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin Binary files differdeleted file mode 100644 index 2f28cb62..00000000 --- a/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_PRIMES.bin b/macros/FunctionAnnotation/FA_SZ_PRIMES.bin Binary files differdeleted file mode 100644 index 353edab7..00000000 --- a/macros/FunctionAnnotation/FA_SZ_PRIMES.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin b/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin Binary files differdeleted file mode 100644 index 3b0c0b78..00000000 --- a/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin b/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin Binary files differdeleted file mode 100644 index f5f1a236..00000000 --- a/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin b/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin Binary files differdeleted file mode 100644 index e5d8e650..00000000 --- a/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_SEL1.bin b/macros/FunctionAnnotation/FA_SZ_SEL1.bin Binary files differdeleted file mode 100644 index 1d68a2e6..00000000 --- a/macros/FunctionAnnotation/FA_SZ_SEL1.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_SZ_SEL2.bin b/macros/FunctionAnnotation/FA_SZ_SEL2.bin Binary files differdeleted file mode 100644 index d3897f7d..00000000 --- a/macros/FunctionAnnotation/FA_SZ_SEL2.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_TP_ASCII.bin b/macros/FunctionAnnotation/FA_TP_ASCII.bin Binary files differdeleted file mode 100644 index 92998284..00000000 --- a/macros/FunctionAnnotation/FA_TP_ASCII.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_TP_C.bin b/macros/FunctionAnnotation/FA_TP_C.bin Binary files differdeleted file mode 100644 index d13d92ca..00000000 --- a/macros/FunctionAnnotation/FA_TP_C.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_TP_COMPLEX.bin b/macros/FunctionAnnotation/FA_TP_COMPLEX.bin Binary files differdeleted file mode 100644 index 3400b2af..00000000 --- a/macros/FunctionAnnotation/FA_TP_COMPLEX.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin b/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin Binary files differdeleted file mode 100644 index a7327099..00000000 --- a/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_TP_D.bin b/macros/FunctionAnnotation/FA_TP_D.bin Binary files differdeleted file mode 100644 index 12293dab..00000000 --- a/macros/FunctionAnnotation/FA_TP_D.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_TP_I.bin b/macros/FunctionAnnotation/FA_TP_I.bin Binary files differdeleted file mode 100644 index 503be40b..00000000 --- a/macros/FunctionAnnotation/FA_TP_I.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_TP_INT16.bin b/macros/FunctionAnnotation/FA_TP_INT16.bin Binary files differdeleted file mode 100644 index fba4305a..00000000 --- a/macros/FunctionAnnotation/FA_TP_INT16.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_TP_INT8.bin b/macros/FunctionAnnotation/FA_TP_INT8.bin Binary files differdeleted file mode 100644 index f67d7485..00000000 --- a/macros/FunctionAnnotation/FA_TP_INT8.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_TP_MAX.bin b/macros/FunctionAnnotation/FA_TP_MAX.bin Binary files differdeleted file mode 100644 index 099ea1ba..00000000 --- a/macros/FunctionAnnotation/FA_TP_MAX.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin b/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin Binary files differdeleted file mode 100644 index 60293a1d..00000000 --- a/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_TP_MODSN.bin b/macros/FunctionAnnotation/FA_TP_MODSN.bin Binary files differdeleted file mode 100644 index cf2e326a..00000000 --- a/macros/FunctionAnnotation/FA_TP_MODSN.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_TP_REAL.bin b/macros/FunctionAnnotation/FA_TP_REAL.bin Binary files differdeleted file mode 100644 index 7e54122a..00000000 --- a/macros/FunctionAnnotation/FA_TP_REAL.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_TP_S.bin b/macros/FunctionAnnotation/FA_TP_S.bin Binary files differdeleted file mode 100644 index 1419e461..00000000 --- a/macros/FunctionAnnotation/FA_TP_S.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_TP_UINT16.bin b/macros/FunctionAnnotation/FA_TP_UINT16.bin Binary files differdeleted file mode 100644 index dc455ca6..00000000 --- a/macros/FunctionAnnotation/FA_TP_UINT16.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_TP_UINT8.bin b/macros/FunctionAnnotation/FA_TP_UINT8.bin Binary files differdeleted file mode 100644 index 508db417..00000000 --- a/macros/FunctionAnnotation/FA_TP_UINT8.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_TP_USER.bin b/macros/FunctionAnnotation/FA_TP_USER.bin Binary files differdeleted file mode 100644 index 87e18d54..00000000 --- a/macros/FunctionAnnotation/FA_TP_USER.bin +++ /dev/null diff --git a/macros/FunctionAnnotation/FA_TP_Z.bin b/macros/FunctionAnnotation/FA_TP_Z.bin Binary files differdeleted file mode 100644 index 6c371723..00000000 --- a/macros/FunctionAnnotation/FA_TP_Z.bin +++ /dev/null diff --git a/macros/FunctionList/FL_ExistCFunction.bin b/macros/FunctionList/FL_ExistCFunction.bin Binary files differdeleted file mode 100644 index 1c85aa21..00000000 --- a/macros/FunctionList/FL_ExistCFunction.bin +++ /dev/null diff --git a/macros/FunctionList/FL_ExtractFuncList.bin b/macros/FunctionList/FL_ExtractFuncList.bin Binary files differdeleted file mode 100644 index ec74708d..00000000 --- a/macros/FunctionList/FL_ExtractFuncList.bin +++ /dev/null diff --git a/macros/FunctionList/FL_GetFunctionClass.bin b/macros/FunctionList/FL_GetFunctionClass.bin Binary files differdeleted file mode 100644 index faa210e6..00000000 --- a/macros/FunctionList/FL_GetFunctionClass.bin +++ /dev/null diff --git a/macros/FunctionList/FL_InOutArgs2CFunNames.bin b/macros/FunctionList/FL_InOutArgs2CFunNames.bin Binary files differdeleted file mode 100644 index 09d5eb5e..00000000 --- a/macros/FunctionList/FL_InOutArgs2CFunNames.bin +++ /dev/null diff --git a/macros/FunctionList/FL_UpdateConverted.bin b/macros/FunctionList/FL_UpdateConverted.bin Binary files differdeleted file mode 100644 index 73f2cf02..00000000 --- a/macros/FunctionList/FL_UpdateConverted.bin +++ /dev/null diff --git a/macros/FunctionList/FL_UpdateToBeConv.bin b/macros/FunctionList/FL_UpdateToBeConv.bin Binary files differdeleted file mode 100644 index 44b5803f..00000000 --- a/macros/FunctionList/FL_UpdateToBeConv.bin +++ /dev/null diff --git a/macros/GeneralFunctions/Array2String.bin b/macros/GeneralFunctions/Array2String.bin Binary files differdeleted file mode 100644 index c40274de..00000000 --- a/macros/GeneralFunctions/Array2String.bin +++ /dev/null diff --git a/macros/GeneralFunctions/ConvertPathMat2C.bin b/macros/GeneralFunctions/ConvertPathMat2C.bin Binary files differdeleted file mode 100644 index 7dd14227..00000000 --- a/macros/GeneralFunctions/ConvertPathMat2C.bin +++ /dev/null diff --git a/macros/GeneralFunctions/File2StringArray.bin b/macros/GeneralFunctions/File2StringArray.bin Binary files differdeleted file mode 100644 index 1b050f4e..00000000 --- a/macros/GeneralFunctions/File2StringArray.bin +++ /dev/null diff --git a/macros/GeneralFunctions/FunName2SciFileName.bin b/macros/GeneralFunctions/FunName2SciFileName.bin Binary files differdeleted file mode 100644 index c3cb5387..00000000 --- a/macros/GeneralFunctions/FunName2SciFileName.bin +++ /dev/null diff --git a/macros/GeneralFunctions/IsNanSize.bin b/macros/GeneralFunctions/IsNanSize.bin Binary files differdeleted file mode 100644 index 71735125..00000000 --- a/macros/GeneralFunctions/IsNanSize.bin +++ /dev/null diff --git a/macros/GeneralFunctions/KeyStr2FileStrPos.bin b/macros/GeneralFunctions/KeyStr2FileStrPos.bin Binary files differdeleted file mode 100644 index 5c6cfaff..00000000 --- a/macros/GeneralFunctions/KeyStr2FileStrPos.bin +++ /dev/null diff --git a/macros/GeneralFunctions/PrintStepInfo.bin b/macros/GeneralFunctions/PrintStepInfo.bin Binary files differdeleted file mode 100644 index 98208f8f..00000000 --- a/macros/GeneralFunctions/PrintStepInfo.bin +++ /dev/null diff --git a/macros/GeneralFunctions/PrintStringInfo.bin b/macros/GeneralFunctions/PrintStringInfo.bin Binary files differdeleted file mode 100644 index c936b207..00000000 --- a/macros/GeneralFunctions/PrintStringInfo.bin +++ /dev/null diff --git a/macros/GeneralFunctions/ReadStringCard.bin b/macros/GeneralFunctions/ReadStringCard.bin Binary files differdeleted file mode 100644 index f9b28283..00000000 --- a/macros/GeneralFunctions/ReadStringCard.bin +++ /dev/null diff --git a/macros/GeneralFunctions/SCI2CCreateDir.bin b/macros/GeneralFunctions/SCI2CCreateDir.bin Binary files differdeleted file mode 100644 index 007b6fb8..00000000 --- a/macros/GeneralFunctions/SCI2CCreateDir.bin +++ /dev/null diff --git a/macros/GeneralFunctions/SCI2CFindFile.bin b/macros/GeneralFunctions/SCI2CFindFile.bin Binary files differdeleted file mode 100644 index fe8e783d..00000000 --- a/macros/GeneralFunctions/SCI2CFindFile.bin +++ /dev/null diff --git a/macros/GeneralFunctions/SCI2CNInArgCheck.bin b/macros/GeneralFunctions/SCI2CNInArgCheck.bin Binary files differdeleted file mode 100644 index 8d96b6e9..00000000 --- a/macros/GeneralFunctions/SCI2CNInArgCheck.bin +++ /dev/null diff --git a/macros/GeneralFunctions/SCI2COpenFileRead.bin b/macros/GeneralFunctions/SCI2COpenFileRead.bin Binary files differdeleted file mode 100644 index f3f6a5e3..00000000 --- a/macros/GeneralFunctions/SCI2COpenFileRead.bin +++ /dev/null diff --git a/macros/GeneralFunctions/SCI2COpenFileWrite.bin b/macros/GeneralFunctions/SCI2COpenFileWrite.bin Binary files differdeleted file mode 100644 index 0287b3aa..00000000 --- a/macros/GeneralFunctions/SCI2COpenFileWrite.bin +++ /dev/null diff --git a/macros/GeneralFunctions/SCI2CTemplate.bin b/macros/GeneralFunctions/SCI2CTemplate.bin Binary files differdeleted file mode 100644 index c485b457..00000000 --- a/macros/GeneralFunctions/SCI2CTemplate.bin +++ /dev/null diff --git a/macros/GeneralFunctions/SCI2Ccopyfile.bin b/macros/GeneralFunctions/SCI2Ccopyfile.bin Binary files differdeleted file mode 100644 index e6d0a866..00000000 --- a/macros/GeneralFunctions/SCI2Ccopyfile.bin +++ /dev/null diff --git a/macros/GeneralFunctions/SCI2Cfileexist.bin b/macros/GeneralFunctions/SCI2Cfileexist.bin Binary files differdeleted file mode 100644 index 524c8c42..00000000 --- a/macros/GeneralFunctions/SCI2Cfileexist.bin +++ /dev/null diff --git a/macros/GeneralFunctions/SCI2Cflipud.bin b/macros/GeneralFunctions/SCI2Cflipud.bin Binary files differdeleted file mode 100644 index baf71bb9..00000000 --- a/macros/GeneralFunctions/SCI2Cflipud.bin +++ /dev/null diff --git a/macros/GeneralFunctions/SCI2Cmdelete.bin b/macros/GeneralFunctions/SCI2Cmdelete.bin Binary files differdeleted file mode 100644 index 67694b7f..00000000 --- a/macros/GeneralFunctions/SCI2Cmdelete.bin +++ /dev/null diff --git a/macros/GeneralFunctions/SCI2Cresize.bin b/macros/GeneralFunctions/SCI2Cresize.bin Binary files differdeleted file mode 100644 index a909d306..00000000 --- a/macros/GeneralFunctions/SCI2Cresize.bin +++ /dev/null diff --git a/macros/GeneralFunctions/SCI2Cstring.bin b/macros/GeneralFunctions/SCI2Cstring.bin Binary files differdeleted file mode 100644 index 887482bb..00000000 --- a/macros/GeneralFunctions/SCI2Cstring.bin +++ /dev/null diff --git a/macros/GeneralFunctions/SCI2Cstrncmp.bin b/macros/GeneralFunctions/SCI2Cstrncmp.bin Binary files differdeleted file mode 100644 index 78ce9a1a..00000000 --- a/macros/GeneralFunctions/SCI2Cstrncmp.bin +++ /dev/null diff --git a/macros/GeneralFunctions/SCI2Cstrncmps1size.bin b/macros/GeneralFunctions/SCI2Cstrncmps1size.bin Binary files differdeleted file mode 100644 index e9a45d96..00000000 --- a/macros/GeneralFunctions/SCI2Cstrncmps1size.bin +++ /dev/null diff --git a/macros/GeneralFunctions/SizeInByte.bin b/macros/GeneralFunctions/SizeInByte.bin Binary files differdeleted file mode 100644 index 04c7a752..00000000 --- a/macros/GeneralFunctions/SizeInByte.bin +++ /dev/null diff --git a/macros/GeneralFunctions/dispina.bin b/macros/GeneralFunctions/dispina.bin Binary files differdeleted file mode 100644 index 25d03faf..00000000 --- a/macros/GeneralFunctions/dispina.bin +++ /dev/null diff --git a/macros/GeneralFunctions/filenamefprintf.bin b/macros/GeneralFunctions/filenamefprintf.bin Binary files differdeleted file mode 100644 index 864a494d..00000000 --- a/macros/GeneralFunctions/filenamefprintf.bin +++ /dev/null diff --git a/macros/GeneralFunctions/float.bin b/macros/GeneralFunctions/float.bin Binary files differdeleted file mode 100644 index fd0c449e..00000000 --- a/macros/GeneralFunctions/float.bin +++ /dev/null diff --git a/macros/GeneralFunctions/squeezestrings.bin b/macros/GeneralFunctions/squeezestrings.bin Binary files differdeleted file mode 100644 index 11b97ec9..00000000 --- a/macros/GeneralFunctions/squeezestrings.bin +++ /dev/null diff --git a/macros/Hardware/AVR/AVRADCSetup.bin b/macros/Hardware/AVR/AVRADCSetup.bin Binary files differdeleted file mode 100644 index a1cbcf3c..00000000 --- a/macros/Hardware/AVR/AVRADCSetup.bin +++ /dev/null diff --git a/macros/Hardware/AVR/AVRDigitalIn.bin b/macros/Hardware/AVR/AVRDigitalIn.bin Binary files differdeleted file mode 100644 index 0fdfab82..00000000 --- a/macros/Hardware/AVR/AVRDigitalIn.bin +++ /dev/null diff --git a/macros/Hardware/AVR/AVRDigitalOut.bin b/macros/Hardware/AVR/AVRDigitalOut.bin Binary files differdeleted file mode 100644 index 7e56e466..00000000 --- a/macros/Hardware/AVR/AVRDigitalOut.bin +++ /dev/null diff --git a/macros/Hardware/AVR/AVRDigitalPortSetup.bin b/macros/Hardware/AVR/AVRDigitalPortSetup.bin Binary files differdeleted file mode 100644 index cf96fbb1..00000000 --- a/macros/Hardware/AVR/AVRDigitalPortSetup.bin +++ /dev/null diff --git a/macros/Hardware/AVR/AVRDigitalSetup.bin b/macros/Hardware/AVR/AVRDigitalSetup.bin Binary files differdeleted file mode 100644 index dec6eb2a..00000000 --- a/macros/Hardware/AVR/AVRDigitalSetup.bin +++ /dev/null diff --git a/macros/Hardware/AVR/AVRGetTimerValue.bin b/macros/Hardware/AVR/AVRGetTimerValue.bin Binary files differdeleted file mode 100644 index 1b883131..00000000 --- a/macros/Hardware/AVR/AVRGetTimerValue.bin +++ /dev/null diff --git a/macros/Hardware/AVR/AVRPWM0SetDuty.bin b/macros/Hardware/AVR/AVRPWM0SetDuty.bin Binary files differdeleted file mode 100644 index 1518222d..00000000 --- a/macros/Hardware/AVR/AVRPWM0SetDuty.bin +++ /dev/null diff --git a/macros/Hardware/AVR/AVRPWM0Setup.bin b/macros/Hardware/AVR/AVRPWM0Setup.bin Binary files differdeleted file mode 100644 index 08867048..00000000 --- a/macros/Hardware/AVR/AVRPWM0Setup.bin +++ /dev/null diff --git a/macros/Hardware/AVR/AVRPWM1SetDuty.bin b/macros/Hardware/AVR/AVRPWM1SetDuty.bin Binary files differdeleted file mode 100644 index 79e4ab62..00000000 --- a/macros/Hardware/AVR/AVRPWM1SetDuty.bin +++ /dev/null diff --git a/macros/Hardware/AVR/AVRPWM1Setup.bin b/macros/Hardware/AVR/AVRPWM1Setup.bin Binary files differdeleted file mode 100644 index 235cdba2..00000000 --- a/macros/Hardware/AVR/AVRPWM1Setup.bin +++ /dev/null diff --git a/macros/Hardware/AVR/AVRPWM2SetDuty.bin b/macros/Hardware/AVR/AVRPWM2SetDuty.bin Binary files differdeleted file mode 100644 index a1c7f3b2..00000000 --- a/macros/Hardware/AVR/AVRPWM2SetDuty.bin +++ /dev/null diff --git a/macros/Hardware/AVR/AVRPWM2Setup.bin b/macros/Hardware/AVR/AVRPWM2Setup.bin Binary files differdeleted file mode 100644 index 66996c08..00000000 --- a/macros/Hardware/AVR/AVRPWM2Setup.bin +++ /dev/null diff --git a/macros/Hardware/AVR/AVRReadADC.bin b/macros/Hardware/AVR/AVRReadADC.bin Binary files differdeleted file mode 100644 index 25b45a83..00000000 --- a/macros/Hardware/AVR/AVRReadADC.bin +++ /dev/null diff --git a/macros/Hardware/AVR/AVRSleep.bin b/macros/Hardware/AVR/AVRSleep.bin Binary files differdeleted file mode 100644 index e4b10d83..00000000 --- a/macros/Hardware/AVR/AVRSleep.bin +++ /dev/null diff --git a/macros/Hardware/AVR/AVRTimerSetup.bin b/macros/Hardware/AVR/AVRTimerSetup.bin Binary files differdeleted file mode 100644 index 775d718a..00000000 --- a/macros/Hardware/AVR/AVRTimerSetup.bin +++ /dev/null diff --git a/macros/Hardware/AVR/AVRUARTReceive.bin b/macros/Hardware/AVR/AVRUARTReceive.bin Binary files differdeleted file mode 100644 index 013036e3..00000000 --- a/macros/Hardware/AVR/AVRUARTReceive.bin +++ /dev/null diff --git a/macros/Hardware/AVR/AVRUARTSetup.bin b/macros/Hardware/AVR/AVRUARTSetup.bin Binary files differdeleted file mode 100644 index 82ec2911..00000000 --- a/macros/Hardware/AVR/AVRUARTSetup.bin +++ /dev/null diff --git a/macros/Hardware/AVR/AVRUARTTransmit.bin b/macros/Hardware/AVR/AVRUARTTransmit.bin Binary files differdeleted file mode 100644 index 9e53d9a6..00000000 --- a/macros/Hardware/AVR/AVRUARTTransmit.bin +++ /dev/null diff --git a/macros/Hardware/AVR/GetAVRSupportFunctions.bin b/macros/Hardware/AVR/GetAVRSupportFunctions.bin Binary files differdeleted file mode 100644 index 48ab5cd8..00000000 --- a/macros/Hardware/AVR/GetAVRSupportFunctions.bin +++ /dev/null diff --git a/macros/Hardware/AVR/GetPeripheral.bin b/macros/Hardware/AVR/GetPeripheral.bin Binary files differdeleted file mode 100644 index b496bbb0..00000000 --- a/macros/Hardware/AVR/GetPeripheral.bin +++ /dev/null diff --git a/macros/Hardware/AVR/InsertPeripheralInList.bin b/macros/Hardware/AVR/InsertPeripheralInList.bin Binary files differdeleted file mode 100644 index c49f4e04..00000000 --- a/macros/Hardware/AVR/InsertPeripheralInList.bin +++ /dev/null diff --git a/macros/Hardware/AVR/IsAVRSupportFunction.bin b/macros/Hardware/AVR/IsAVRSupportFunction.bin Binary files differdeleted file mode 100644 index e2382308..00000000 --- a/macros/Hardware/AVR/IsAVRSupportFunction.bin +++ /dev/null diff --git a/macros/Hardware/RasberryPi/GetRPISupportFunctions.bin b/macros/Hardware/RasberryPi/GetRPISupportFunctions.bin Binary files differdeleted file mode 100644 index a70999c0..00000000 --- a/macros/Hardware/RasberryPi/GetRPISupportFunctions.bin +++ /dev/null diff --git a/macros/Hardware/RasberryPi/IsRPISupportFunction.bin b/macros/Hardware/RasberryPi/IsRPISupportFunction.bin Binary files differdeleted file mode 100644 index 11533d3e..00000000 --- a/macros/Hardware/RasberryPi/IsRPISupportFunction.bin +++ /dev/null diff --git a/macros/Hardware/RasberryPi/RPI_DelayMicro.bin b/macros/Hardware/RasberryPi/RPI_DelayMicro.bin Binary files differdeleted file mode 100644 index a4d32cb6..00000000 --- a/macros/Hardware/RasberryPi/RPI_DelayMicro.bin +++ /dev/null diff --git a/macros/Hardware/RasberryPi/RPI_DelayMilli.bin b/macros/Hardware/RasberryPi/RPI_DelayMilli.bin Binary files differdeleted file mode 100644 index b6eeb30b..00000000 --- a/macros/Hardware/RasberryPi/RPI_DelayMilli.bin +++ /dev/null diff --git a/macros/Hardware/RasberryPi/RPI_DigitalIn.bin b/macros/Hardware/RasberryPi/RPI_DigitalIn.bin Binary files differdeleted file mode 100644 index f4c16f39..00000000 --- a/macros/Hardware/RasberryPi/RPI_DigitalIn.bin +++ /dev/null diff --git a/macros/Hardware/RasberryPi/RPI_DigitalOut.bin b/macros/Hardware/RasberryPi/RPI_DigitalOut.bin Binary files differdeleted file mode 100644 index b7ad06e5..00000000 --- a/macros/Hardware/RasberryPi/RPI_DigitalOut.bin +++ /dev/null diff --git a/macros/Hardware/RasberryPi/RPI_DigitalSetup.bin b/macros/Hardware/RasberryPi/RPI_DigitalSetup.bin Binary files differdeleted file mode 100644 index 1ac5b582..00000000 --- a/macros/Hardware/RasberryPi/RPI_DigitalSetup.bin +++ /dev/null diff --git a/macros/Hardware/RasberryPi/RPI_GetMicros.bin b/macros/Hardware/RasberryPi/RPI_GetMicros.bin Binary files differdeleted file mode 100644 index 3e6c08fa..00000000 --- a/macros/Hardware/RasberryPi/RPI_GetMicros.bin +++ /dev/null diff --git a/macros/Hardware/RasberryPi/RPI_GetMillis.bin b/macros/Hardware/RasberryPi/RPI_GetMillis.bin Binary files differdeleted file mode 100644 index b9143650..00000000 --- a/macros/Hardware/RasberryPi/RPI_GetMillis.bin +++ /dev/null diff --git a/macros/Hardware/RasberryPi/RPI_HardPWMSetClock.bin b/macros/Hardware/RasberryPi/RPI_HardPWMSetClock.bin Binary files differdeleted file mode 100644 index 1efe0803..00000000 --- a/macros/Hardware/RasberryPi/RPI_HardPWMSetClock.bin +++ /dev/null diff --git a/macros/Hardware/RasberryPi/RPI_HardPWMSetMode.bin b/macros/Hardware/RasberryPi/RPI_HardPWMSetMode.bin Binary files differdeleted file mode 100644 index 075d6e60..00000000 --- a/macros/Hardware/RasberryPi/RPI_HardPWMSetMode.bin +++ /dev/null diff --git a/macros/Hardware/RasberryPi/RPI_HardPWMSetRange.bin b/macros/Hardware/RasberryPi/RPI_HardPWMSetRange.bin Binary files differdeleted file mode 100644 index 8ded2709..00000000 --- a/macros/Hardware/RasberryPi/RPI_HardPWMSetRange.bin +++ /dev/null diff --git a/macros/Hardware/RasberryPi/RPI_HardPWMWrite.bin b/macros/Hardware/RasberryPi/RPI_HardPWMWrite.bin Binary files differdeleted file mode 100644 index 9957f3a4..00000000 --- a/macros/Hardware/RasberryPi/RPI_HardPWMWrite.bin +++ /dev/null diff --git a/macros/Hardware/RasberryPi/RPI_PinISR.bin b/macros/Hardware/RasberryPi/RPI_PinISR.bin Binary files differdeleted file mode 100644 index ddeff684..00000000 --- a/macros/Hardware/RasberryPi/RPI_PinISR.bin +++ /dev/null diff --git a/macros/Hardware/RasberryPi/RPI_SerialClose.bin b/macros/Hardware/RasberryPi/RPI_SerialClose.bin Binary files differdeleted file mode 100644 index dce972dc..00000000 --- a/macros/Hardware/RasberryPi/RPI_SerialClose.bin +++ /dev/null diff --git a/macros/Hardware/RasberryPi/RPI_SerialFlush.bin b/macros/Hardware/RasberryPi/RPI_SerialFlush.bin Binary files differdeleted file mode 100644 index 2a3704d0..00000000 --- a/macros/Hardware/RasberryPi/RPI_SerialFlush.bin +++ /dev/null diff --git a/macros/Hardware/RasberryPi/RPI_SerialGetChar.bin b/macros/Hardware/RasberryPi/RPI_SerialGetChar.bin Binary files differdeleted file mode 100644 index 928f28a3..00000000 --- a/macros/Hardware/RasberryPi/RPI_SerialGetChar.bin +++ /dev/null diff --git a/macros/Hardware/RasberryPi/RPI_SerialSendChar.bin b/macros/Hardware/RasberryPi/RPI_SerialSendChar.bin Binary files differdeleted file mode 100644 index 7614ebcb..00000000 --- a/macros/Hardware/RasberryPi/RPI_SerialSendChar.bin +++ /dev/null diff --git a/macros/Hardware/RasberryPi/RPI_SerialSendData.bin b/macros/Hardware/RasberryPi/RPI_SerialSendData.bin Binary files differdeleted file mode 100644 index a3524a6c..00000000 --- a/macros/Hardware/RasberryPi/RPI_SerialSendData.bin +++ /dev/null diff --git a/macros/Hardware/RasberryPi/RPI_SerialSetup.bin b/macros/Hardware/RasberryPi/RPI_SerialSetup.bin Binary files differdeleted file mode 100644 index 0128c27b..00000000 --- a/macros/Hardware/RasberryPi/RPI_SerialSetup.bin +++ /dev/null diff --git a/macros/Hardware/RasberryPi/u16RPISerialDataAvail.bin b/macros/Hardware/RasberryPi/u16RPISerialDataAvail.bin Binary files differdeleted file mode 100644 index 3789bd6c..00000000 --- a/macros/Hardware/RasberryPi/u16RPISerialDataAvail.bin +++ /dev/null diff --git a/macros/ImageProcessing/core/CV_CreateImage.bin b/macros/ImageProcessing/core/CV_CreateImage.bin Binary files differdeleted file mode 100644 index d5aa3080..00000000 --- a/macros/ImageProcessing/core/CV_CreateImage.bin +++ /dev/null diff --git a/macros/ImageProcessing/core/CV_GetImgSize.bin b/macros/ImageProcessing/core/CV_GetImgSize.bin Binary files differdeleted file mode 100644 index ede60e6f..00000000 --- a/macros/ImageProcessing/core/CV_GetImgSize.bin +++ /dev/null diff --git a/macros/ImageProcessing/highgui/CV_LoadImage.bin b/macros/ImageProcessing/highgui/CV_LoadImage.bin Binary files differdeleted file mode 100644 index f8e13375..00000000 --- a/macros/ImageProcessing/highgui/CV_LoadImage.bin +++ /dev/null diff --git a/macros/ImageProcessing/highgui/CV_SaveImage.bin b/macros/ImageProcessing/highgui/CV_SaveImage.bin Binary files differdeleted file mode 100644 index 8d056bf1..00000000 --- a/macros/ImageProcessing/highgui/CV_SaveImage.bin +++ /dev/null diff --git a/macros/ImageProcessing/highgui/CV_ShowImage.bin b/macros/ImageProcessing/highgui/CV_ShowImage.bin Binary files differdeleted file mode 100644 index c4e00fc7..00000000 --- a/macros/ImageProcessing/highgui/CV_ShowImage.bin +++ /dev/null diff --git a/macros/ImageProcessing/highgui/CV_WaitKey.bin b/macros/ImageProcessing/highgui/CV_WaitKey.bin Binary files differdeleted file mode 100644 index 30a42f41..00000000 --- a/macros/ImageProcessing/highgui/CV_WaitKey.bin +++ /dev/null diff --git a/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.bin b/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.bin Binary files differdeleted file mode 100644 index 26a58c0c..00000000 --- a/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.bin +++ /dev/null diff --git a/macros/ImageProcessing/imgproc/CV_Blur.bin b/macros/ImageProcessing/imgproc/CV_Blur.bin Binary files differdeleted file mode 100644 index 9fc1af49..00000000 --- a/macros/ImageProcessing/imgproc/CV_Blur.bin +++ /dev/null diff --git a/macros/ImageProcessing/imgproc/CV_Canny.bin b/macros/ImageProcessing/imgproc/CV_Canny.bin Binary files differdeleted file mode 100644 index df824781..00000000 --- a/macros/ImageProcessing/imgproc/CV_Canny.bin +++ /dev/null diff --git a/macros/ImageProcessing/imgproc/CV_CornerHarris.bin b/macros/ImageProcessing/imgproc/CV_CornerHarris.bin Binary files differdeleted file mode 100644 index 291d3e4d..00000000 --- a/macros/ImageProcessing/imgproc/CV_CornerHarris.bin +++ /dev/null diff --git a/macros/ImageProcessing/imgproc/CV_CvtColor.bin b/macros/ImageProcessing/imgproc/CV_CvtColor.bin Binary files differdeleted file mode 100644 index eee1018f..00000000 --- a/macros/ImageProcessing/imgproc/CV_CvtColor.bin +++ /dev/null diff --git a/macros/ImageProcessing/imgproc/CV_Dilate.bin b/macros/ImageProcessing/imgproc/CV_Dilate.bin Binary files differdeleted file mode 100644 index 3f2d2d99..00000000 --- a/macros/ImageProcessing/imgproc/CV_Dilate.bin +++ /dev/null diff --git a/macros/ImageProcessing/imgproc/CV_DistanceTransform.bin b/macros/ImageProcessing/imgproc/CV_DistanceTransform.bin Binary files differdeleted file mode 100644 index 0955b5f0..00000000 --- a/macros/ImageProcessing/imgproc/CV_DistanceTransform.bin +++ /dev/null diff --git a/macros/ImageProcessing/imgproc/CV_Erode.bin b/macros/ImageProcessing/imgproc/CV_Erode.bin Binary files differdeleted file mode 100644 index 33d42312..00000000 --- a/macros/ImageProcessing/imgproc/CV_Erode.bin +++ /dev/null diff --git a/macros/ImageProcessing/imgproc/CV_GaussianBlur.bin b/macros/ImageProcessing/imgproc/CV_GaussianBlur.bin Binary files differdeleted file mode 100644 index b1766626..00000000 --- a/macros/ImageProcessing/imgproc/CV_GaussianBlur.bin +++ /dev/null diff --git a/macros/ImageProcessing/imgproc/CV_MedianBlur.bin b/macros/ImageProcessing/imgproc/CV_MedianBlur.bin Binary files differdeleted file mode 100644 index fdcd23ed..00000000 --- a/macros/ImageProcessing/imgproc/CV_MedianBlur.bin +++ /dev/null diff --git a/macros/ImageProcessing/imgproc/CV_Threshold.bin b/macros/ImageProcessing/imgproc/CV_Threshold.bin Binary files differdeleted file mode 100644 index c2ce1c60..00000000 --- a/macros/ImageProcessing/imgproc/CV_Threshold.bin +++ /dev/null diff --git a/macros/Scilab-Arduino/GenerateSetupFunction.bin b/macros/Scilab-Arduino/GenerateSetupFunction.bin Binary files differdeleted file mode 100644 index 0051630c..00000000 --- a/macros/Scilab-Arduino/GenerateSetupFunction.bin +++ /dev/null diff --git a/macros/Scilab-Arduino/GetArduinoFunctions.bin b/macros/Scilab-Arduino/GetArduinoFunctions.bin Binary files differdeleted file mode 100644 index fe9e2040..00000000 --- a/macros/Scilab-Arduino/GetArduinoFunctions.bin +++ /dev/null diff --git a/macros/Scilab-Arduino/GetArduinoSetupFunctions.bin b/macros/Scilab-Arduino/GetArduinoSetupFunctions.bin Binary files differdeleted file mode 100644 index 67f9fada..00000000 --- a/macros/Scilab-Arduino/GetArduinoSetupFunctions.bin +++ /dev/null diff --git a/macros/Scilab-Arduino/InsertSetupInList.bin b/macros/Scilab-Arduino/InsertSetupInList.bin Binary files differdeleted file mode 100644 index 29e37315..00000000 --- a/macros/Scilab-Arduino/InsertSetupInList.bin +++ /dev/null diff --git a/macros/Scilab-Arduino/IsArduinoFunction.bin b/macros/Scilab-Arduino/IsArduinoFunction.bin Binary files differdeleted file mode 100644 index 5dbfacad..00000000 --- a/macros/Scilab-Arduino/IsArduinoFunction.bin +++ /dev/null diff --git a/macros/Scilab-Arduino/IsArduinoSetupFunction.bin b/macros/Scilab-Arduino/IsArduinoSetupFunction.bin Binary files differdeleted file mode 100644 index 8948d1a3..00000000 --- a/macros/Scilab-Arduino/IsArduinoSetupFunction.bin +++ /dev/null diff --git a/macros/Scilab-Arduino/cmd_i2c_dev.sci b/macros/Scilab-Arduino/cmd_i2c_dev.sci new file mode 100644 index 00000000..37854cf3 --- /dev/null +++ b/macros/Scilab-Arduino/cmd_i2c_dev.sci @@ -0,0 +1,3 @@ +function z = cmd_i2c_dev(address) + z = 0 +endfunction diff --git a/macros/Scilab-Arduino/cmd_i2c_read.sci b/macros/Scilab-Arduino/cmd_i2c_read.sci new file mode 100644 index 00000000..1edc1aae --- /dev/null +++ b/macros/Scilab-Arduino/cmd_i2c_read.sci @@ -0,0 +1,2 @@ +function y = cmd_i2c_read(address,bytes) +endfunction diff --git a/macros/Scilab-Arduino/cmd_i2c_read_register.sci b/macros/Scilab-Arduino/cmd_i2c_read_register.sci new file mode 100644 index 00000000..f5394a66 --- /dev/null +++ b/macros/Scilab-Arduino/cmd_i2c_read_register.sci @@ -0,0 +1,3 @@ +function x = cmd_i2c_read_register(address,reg_adrs) + x = 0; +endfunction diff --git a/macros/Scilab-Arduino/cmd_i2c_write.sci b/macros/Scilab-Arduino/cmd_i2c_write.sci new file mode 100644 index 00000000..8ed8eb4e --- /dev/null +++ b/macros/Scilab-Arduino/cmd_i2c_write.sci @@ -0,0 +1,2 @@ +function cmd_i2c_write(address,data) +endfunction diff --git a/macros/Scilab-Arduino/cmd_i2c_write_register.sci b/macros/Scilab-Arduino/cmd_i2c_write_register.sci new file mode 100644 index 00000000..02c48393 --- /dev/null +++ b/macros/Scilab-Arduino/cmd_i2c_write_register.sci @@ -0,0 +1,2 @@ +function cmd_i2c_write_register(address, reg_adrs, data) +endfunction diff --git a/macros/Scilab-Arduino/i2c_dev.sci b/macros/Scilab-Arduino/i2c_dev.sci deleted file mode 100644 index f86e588a..00000000 --- a/macros/Scilab-Arduino/i2c_dev.sci +++ /dev/null @@ -1,3 +0,0 @@ -function z = i2c_dev(address) - z = 0 -endfunction diff --git a/macros/Scilab-Arduino/i2c_read.sci b/macros/Scilab-Arduino/i2c_read.sci deleted file mode 100644 index 6916b9c1..00000000 --- a/macros/Scilab-Arduino/i2c_read.sci +++ /dev/null @@ -1,2 +0,0 @@ -function y = i2c_read(address,bytes) -endfunction diff --git a/macros/Scilab-Arduino/i2c_read_register.sci b/macros/Scilab-Arduino/i2c_read_register.sci deleted file mode 100644 index 51a88eeb..00000000 --- a/macros/Scilab-Arduino/i2c_read_register.sci +++ /dev/null @@ -1,3 +0,0 @@ -function x = i2c_read_register(address,reg_adrs) - x = 0; -endfunction diff --git a/macros/Scilab-Arduino/i2c_write.sci b/macros/Scilab-Arduino/i2c_write.sci deleted file mode 100644 index 8dfd070a..00000000 --- a/macros/Scilab-Arduino/i2c_write.sci +++ /dev/null @@ -1,2 +0,0 @@ -function i2c_write(address,data) -endfunction diff --git a/macros/Scilab-Arduino/i2c_write_register.sci b/macros/Scilab-Arduino/i2c_write_register.sci deleted file mode 100644 index a9b55530..00000000 --- a/macros/Scilab-Arduino/i2c_write_register.sci +++ /dev/null @@ -1,2 +0,0 @@ -function i2c_write_register(address, reg_adrs, data) -endfunction diff --git a/macros/Scilab-Arduino/names b/macros/Scilab-Arduino/names index c1386c3b..8b8d7c48 100644 --- a/macros/Scilab-Arduino/names +++ b/macros/Scilab-Arduino/names @@ -4,8 +4,8 @@ GetArduinoSetupFunctions InsertSetupInList IsArduinoFunction IsArduinoSetupFunction -i2c_dev -i2c_read -i2c_read_register -i2c_write -i2c_write_register +cmd_i2c_dev +cmd_i2c_read +cmd_i2c_read_register +cmd_i2c_write +cmd_i2c_write_register diff --git a/macros/SymbolTable/ST_AnalyzeScope.bin b/macros/SymbolTable/ST_AnalyzeScope.bin Binary files differdeleted file mode 100644 index 7e727a04..00000000 --- a/macros/SymbolTable/ST_AnalyzeScope.bin +++ /dev/null diff --git a/macros/SymbolTable/ST_Del.bin b/macros/SymbolTable/ST_Del.bin Binary files differdeleted file mode 100644 index c26e2e58..00000000 --- a/macros/SymbolTable/ST_Del.bin +++ /dev/null diff --git a/macros/SymbolTable/ST_FindPos.bin b/macros/SymbolTable/ST_FindPos.bin Binary files differdeleted file mode 100644 index c7003f30..00000000 --- a/macros/SymbolTable/ST_FindPos.bin +++ /dev/null diff --git a/macros/SymbolTable/ST_Get.bin b/macros/SymbolTable/ST_Get.bin Binary files differdeleted file mode 100644 index 512e72b7..00000000 --- a/macros/SymbolTable/ST_Get.bin +++ /dev/null diff --git a/macros/SymbolTable/ST_GetInArgInfo.bin b/macros/SymbolTable/ST_GetInArgInfo.bin Binary files differdeleted file mode 100644 index 6eb16e37..00000000 --- a/macros/SymbolTable/ST_GetInArgInfo.bin +++ /dev/null diff --git a/macros/SymbolTable/ST_GetSymbolInfo.bin b/macros/SymbolTable/ST_GetSymbolInfo.bin Binary files differdeleted file mode 100644 index b8a7cf74..00000000 --- a/macros/SymbolTable/ST_GetSymbolInfo.bin +++ /dev/null diff --git a/macros/SymbolTable/ST_InsForCntVars.bin b/macros/SymbolTable/ST_InsForCntVars.bin Binary files differdeleted file mode 100644 index 12882fc7..00000000 --- a/macros/SymbolTable/ST_InsForCntVars.bin +++ /dev/null diff --git a/macros/SymbolTable/ST_InsOutArg.bin b/macros/SymbolTable/ST_InsOutArg.bin Binary files differdeleted file mode 100644 index ec9970cb..00000000 --- a/macros/SymbolTable/ST_InsOutArg.bin +++ /dev/null diff --git a/macros/SymbolTable/ST_Load.bin b/macros/SymbolTable/ST_Load.bin Binary files differdeleted file mode 100644 index f158c2b6..00000000 --- a/macros/SymbolTable/ST_Load.bin +++ /dev/null diff --git a/macros/SymbolTable/ST_MatchSymbol.bin b/macros/SymbolTable/ST_MatchSymbol.bin Binary files differdeleted file mode 100644 index 278560d0..00000000 --- a/macros/SymbolTable/ST_MatchSymbol.bin +++ /dev/null diff --git a/macros/SymbolTable/ST_Save.bin b/macros/SymbolTable/ST_Save.bin Binary files differdeleted file mode 100644 index 4aa50a20..00000000 --- a/macros/SymbolTable/ST_Save.bin +++ /dev/null diff --git a/macros/SymbolTable/ST_Set.bin b/macros/SymbolTable/ST_Set.bin Binary files differdeleted file mode 100644 index cbd26274..00000000 --- a/macros/SymbolTable/ST_Set.bin +++ /dev/null diff --git a/macros/ToolInitialization/INIT_CreateDirs.bin b/macros/ToolInitialization/INIT_CreateDirs.bin Binary files differdeleted file mode 100644 index 16ebab82..00000000 --- a/macros/ToolInitialization/INIT_CreateDirs.bin +++ /dev/null diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin Binary files differdeleted file mode 100644 index 07ddd6ec..00000000 --- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin +++ /dev/null diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 67cabb2b..a2bf5738 100644 --- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -844,6 +844,207 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
// -------------------
+// --- Class Isreal. ---
+// -------------------
+ClassName = 'Isreal';
+
+// --- 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');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+//---Function list class. ----
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
+//PrintStringInfo('z0'+ArgSeparator+'d0',ClassFileName,'file','y');
+//PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'isreal';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+ClassName = 'gcd';
+
+// --- 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');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+//---Function list class. ----
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('u82'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y');
+//PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y');
+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'gcd';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+ClassName = 'nextpow2';
+
+// --- 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');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+//PrintStringInfo('u82'+ArgSeparator+'u80',ClassFileName,'file','y');
+//PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'nextpow2';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+
+ClassName = 'interp1';
+
+// --- 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');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 3',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER
+PrintStringInfo('OUT(1).SZ(1)= IN(3).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(3).SZ(2)',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 4',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+//---Function list class. ----
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+//PrintStringInfo('u82'+ArgSeparator+'u80',ClassFileName,'file','y');
+//PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y');
+//PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y');
+PrintStringInfo('d2d2d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('d2d2d2g2'+ArgSeparator+'d2',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'interp1';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+// -------------------
+// --- Class DCT. ---
+// -------------------
+ClassName = 'dct';
+
+// --- 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');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+// --- Function List Class. ---
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+
+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');
+PrintStringInfo('z2d0'+ArgSeparator+'z2',ClassFileName,'file','y');
+PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');
+PrintStringInfo('c2s0'+ArgSeparator+'c2',ClassFileName,'file','y');
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'dct';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+// -------------------
+// --- Class IDCT. ---
+// -------------------
+ClassName = 'idct';
+
+// --- 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');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+// --- Function List Class. ---
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+
+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');
+PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'idct';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+
+// -------------------
// --- Class Sqrt. ---
// -------------------
ClassName = 'Sqrt';
@@ -7832,6 +8033,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d2d2d2'+ArgSeparator+'d0',ClassFileName,'file','y');
PrintStringInfo('d2d2d0g2'+ArgSeparator+'d0',ClassFileName,'file','y');
//PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
//PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
@@ -7849,6 +8051,36 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+// --- Class Modk. ---
+// ------------------
+ClassName = 'Modk';
+
+// --- 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= ''d''',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+// --- Function List Class. ---
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+//PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
+//PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
+
+//PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');
+//PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');
+//PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');
+//PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'modk';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
//------------------------------------
//---- Class PRIMES --------------------
diff --git a/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin b/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin Binary files differdeleted file mode 100644 index f7d2aa59..00000000 --- a/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin +++ /dev/null diff --git a/macros/ToolInitialization/INIT_GenFileInfo.bin b/macros/ToolInitialization/INIT_GenFileInfo.bin Binary files differdeleted file mode 100644 index a8d47222..00000000 --- a/macros/ToolInitialization/INIT_GenFileInfo.bin +++ /dev/null diff --git a/macros/ToolInitialization/INIT_GenLibraries.bin b/macros/ToolInitialization/INIT_GenLibraries.bin Binary files differdeleted file mode 100644 index bc3bc873..00000000 --- a/macros/ToolInitialization/INIT_GenLibraries.bin +++ /dev/null diff --git a/macros/ToolInitialization/INIT_GenSharedInfo.bin b/macros/ToolInitialization/INIT_GenSharedInfo.bin Binary files differdeleted file mode 100644 index 7263830a..00000000 --- a/macros/ToolInitialization/INIT_GenSharedInfo.bin +++ /dev/null diff --git a/macros/ToolInitialization/INIT_LoadLibraries.bin b/macros/ToolInitialization/INIT_LoadLibraries.bin Binary files differdeleted file mode 100644 index c85aac6e..00000000 --- a/macros/ToolInitialization/INIT_LoadLibraries.bin +++ /dev/null diff --git a/macros/ToolInitialization/INIT_RemoveDirs.bin b/macros/ToolInitialization/INIT_RemoveDirs.bin Binary files differdeleted file mode 100644 index c1ee9ec0..00000000 --- a/macros/ToolInitialization/INIT_RemoveDirs.bin +++ /dev/null diff --git a/macros/ToolInitialization/INIT_SCI2C.bin b/macros/ToolInitialization/INIT_SCI2C.bin Binary files differdeleted file mode 100644 index 19402302..00000000 --- a/macros/ToolInitialization/INIT_SCI2C.bin +++ /dev/null diff --git a/macros/ToolInitialization/INIT_SharedInfoEqual.bin b/macros/ToolInitialization/INIT_SharedInfoEqual.bin Binary files differdeleted file mode 100644 index 31238a31..00000000 --- a/macros/ToolInitialization/INIT_SharedInfoEqual.bin +++ /dev/null diff --git a/macros/ToolInitialization/ManageNextConversion.bin b/macros/ToolInitialization/ManageNextConversion.bin Binary files differdeleted file mode 100644 index 0d2db5fa..00000000 --- a/macros/ToolInitialization/ManageNextConversion.bin +++ /dev/null diff --git a/macros/ToolInitialization/UpdateSCI2CInfo.bin b/macros/ToolInitialization/UpdateSCI2CInfo.bin Binary files differdeleted file mode 100644 index c13904d2..00000000 --- a/macros/ToolInitialization/UpdateSCI2CInfo.bin +++ /dev/null diff --git a/macros/ToolInitialization/doublecomplex.bin b/macros/ToolInitialization/doublecomplex.bin Binary files differdeleted file mode 100644 index 5e616f7c..00000000 --- a/macros/ToolInitialization/doublecomplex.bin +++ /dev/null diff --git a/macros/ToolInitialization/floatcomplex.bin b/macros/ToolInitialization/floatcomplex.bin Binary files differdeleted file mode 100644 index bd77a45f..00000000 --- a/macros/ToolInitialization/floatcomplex.bin +++ /dev/null diff --git a/macros/ToolInitialization/lib b/macros/ToolInitialization/lib Binary files differindex 8fc6062d..4d03bdc5 100644 --- a/macros/ToolInitialization/lib +++ b/macros/ToolInitialization/lib diff --git a/macros/cb_sci2c_gui.bin b/macros/cb_sci2c_gui.bin Binary files differdeleted file mode 100644 index bc691e45..00000000 --- a/macros/cb_sci2c_gui.bin +++ /dev/null diff --git a/macros/cb_sci2c_gui.sci b/macros/cb_sci2c_gui.sci index 9dbe9742..7bb0e733 100644 --- a/macros/cb_sci2c_gui.sci +++ b/macros/cb_sci2c_gui.sci @@ -180,6 +180,8 @@ elseif get(gcbo, "tag")=="convertbtn" then Board_name = "lilypad" elseif get(findobj("tag", "brdnmType"), "value") == 28 then Board_name = "lilyPadUSB" + else + Board_name = "uno" //elseif get(findobj("tag", "brdnmType"), "value") == [1 0 0 0 0 0] then //Board_name = "none" @@ -195,6 +197,7 @@ elseif get(gcbo, "tag")=="convertbtn" then // CCompilerPathStyle = "cygwin"; end + // -*- DEBUG ONLY -*- // mprintf("UserScilabMainFile = {%s}\n", UserScilabMainFile); diff --git a/macros/findDeps/Scilab2CDeps.bin b/macros/findDeps/Scilab2CDeps.bin Binary files differdeleted file mode 100644 index ae162ecb..00000000 --- a/macros/findDeps/Scilab2CDeps.bin +++ /dev/null diff --git a/macros/findDeps/findDeps.bin b/macros/findDeps/findDeps.bin Binary files differdeleted file mode 100644 index fb11e006..00000000 --- a/macros/findDeps/findDeps.bin +++ /dev/null diff --git a/macros/findDeps/getAllHeaders.bin b/macros/findDeps/getAllHeaders.bin Binary files differdeleted file mode 100644 index 12232be6..00000000 --- a/macros/findDeps/getAllHeaders.bin +++ /dev/null diff --git a/macros/findDeps/getAllHeaders.sci b/macros/findDeps/getAllHeaders.sci index 7fb20f05..b246c104 100644 --- a/macros/findDeps/getAllHeaders.sci +++ b/macros/findDeps/getAllHeaders.sci @@ -72,6 +72,10 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/matrixOperations/includes/kron.h" "src/c/matrixOperations/includes/flipdim.h" "src/c/matrixOperations/includes/norm.h" + "src/c/interpolation/includes/interp1.h" + "src/c/elementaryFunctions/includes/nextpow2.h" + "src/c/elementaryFunctions/includes/gcd.h" + "src/c/elementaryFunctions/includes/isreal.h" "src/c/elementaryFunctions/includes/cos.h" "src/c/elementaryFunctions/includes/fix.h" "src/c/elementaryFunctions/includes/exp.h" @@ -140,6 +144,9 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/string/includes/dynlib_string.h" "src/c/string/includes/disp.h" "src/c/string/includes/str.h" + "src/c/signalProcessing/includes/modk.h" + "src/c/signalProcessing/includes/idct.h" + "src/c/signalProcessing/includes/dct.h" "src/c/signalProcessing/fft/fft_internal.h" "src/c/signalProcessing/ifft/ifft_internal.h" "src/c/signalProcessing/levin/levinUtils.h" diff --git a/macros/findDeps/getAllInterfaces.bin b/macros/findDeps/getAllInterfaces.bin Binary files differdeleted file mode 100644 index a9f1efc2..00000000 --- a/macros/findDeps/getAllInterfaces.bin +++ /dev/null diff --git a/macros/findDeps/getAllInterfaces.sci b/macros/findDeps/getAllInterfaces.sci index 26a2cf9b..13324c45 100644 --- a/macros/findDeps/getAllInterfaces.sci +++ b/macros/findDeps/getAllInterfaces.sci @@ -61,6 +61,10 @@ function allInterfaces = getAllInterfaces(SharedInfo) "src/c/matrixOperations/interfaces/int_flipdim.h" "src/c/matrixOperations/interfaces/int_permute.h" "src/c/matrixOperations/interfaces/int_norm.h" + "src/c/interpolation/interfaces/int_interp1.h" + "src/c/elementaryFunctions/interfaces/int_nextpow2.h" + "src/c/elementaryFunctions/interfaces/int_gcd.h" + "src/c/elementaryFunctions/interfaces/int_isreal.h" "src/c/elementaryFunctions/interfaces/int_asinh.h" "src/c/elementaryFunctions/interfaces/int_atanh.h" "src/c/elementaryFunctions/interfaces/int_sinh.h" @@ -142,6 +146,9 @@ function allInterfaces = getAllInterfaces(SharedInfo) "src/c/operations/interfaces/int_OpIns.h" "src/c/string/interfaces/int_disp.h" "src/c/string/interfaces/int_string.h" + "src/c/signalProcessing/interfaces/int_modk.h" + "src/c/signalProcessing/interfaces/int_idct.h" + "src/c/signalProcessing/interfaces/int_dct.h" "src/c/signalProcessing/interfaces/int_ifft.h" "src/c/signalProcessing/interfaces/int_lpc2cep.h" "src/c/signalProcessing/interfaces/int_cepstrum.h" diff --git a/macros/findDeps/getAllLibraries.bin b/macros/findDeps/getAllLibraries.bin Binary files differdeleted file mode 100644 index 098b51e6..00000000 --- a/macros/findDeps/getAllLibraries.bin +++ /dev/null diff --git a/macros/findDeps/getAllSources.bin b/macros/findDeps/getAllSources.bin Binary files differdeleted file mode 100644 index 01f67337..00000000 --- a/macros/findDeps/getAllSources.bin +++ /dev/null diff --git a/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci index 85255dea..a7e2d794 100644 --- a/macros/findDeps/getAllSources.sci +++ b/macros/findDeps/getAllSources.sci @@ -330,6 +330,9 @@ function allSources = getAllSources(SharedInfo) "src/c/matrixOperations/kron/skrona.c" "src/c/matrixOperations/norm/dnormv.c" "src/c/matrixOperations/norm/dnorma.c" + "src/c/elementaryFunctions/nextpow2/dnextpow2a.c" + "src/c/elementaryFunctions/isreal/sisreals.c" + "src/c/elementaryFunctions/isreal/disreals.c" "src/c/elementaryFunctions/cos/dcosa.c" "src/c/elementaryFunctions/cos/dcoss.c" "src/c/elementaryFunctions/cos/scosa.c" @@ -962,6 +965,13 @@ function allSources = getAllSources(SharedInfo) "src/c/string/string/u16strings.c" "src/c/string/string/i16stringa.c" "src/c/string/string/i16strings.c" + "src/c/signalProcessing/modk/dmodka.c" + "src/c/signalProcessing/transforms/idct/cidcta.c" + "src/c/signalProcessing/transforms/idct/zidcta.c" + "src/c/signalProcessing/transforms/idct/didcta.c" + "src/c/signalProcessing/transforms/dct/cdcta.c" + "src/c/signalProcessing/transforms/dct/zdcta.c" + "src/c/signalProcessing/transforms/dct/ddcta.c" "src/c/signalProcessing/fft/dfft2.c" "src/c/signalProcessing/fft/cfftma.c" "src/c/signalProcessing/fft/r2tx.c" @@ -1195,8 +1205,11 @@ function allSources = getAllSources(SharedInfo) "src/c/elementaryFunctions/Trigonometry/sech/zsechs.c" "src/c/elementaryFunctions/Trigonometry/sech/csecha.c" "src/c/elementaryFunctions/Trigonometry/sech/csechs.c" + "src/c/interpolation/interp1/dinterp13a.c" + "src/c/elementaryFunctions/discrete_mathematics/gcd/u8gcds.c" "src/c/elementaryFunctions/Trigonometry/sinc/dsinca.c" "src/c/elementaryFunctions/Trigonometry/sinc/zsinca.c" + "src/c/elementaryFunctions/discrete_mathematics/gcd/dgcda.c" "src/c/elementaryFunctions/discrete_mathematics/factorial/dfactorials.c" "src/c/elementaryFunctions/discrete_mathematics/factorial/dfactoriala.c" "src/c/elementaryFunctions/discrete_mathematics/factorial/sfactorials.c" diff --git a/macros/findDeps/getArduinoFiles.bin b/macros/findDeps/getArduinoFiles.bin Binary files differdeleted file mode 100644 index 411018b0..00000000 --- a/macros/findDeps/getArduinoFiles.bin +++ /dev/null diff --git a/macros/findDeps/lib b/macros/findDeps/lib Binary files differindex 4f7fa99b..a49dc793 100644 --- a/macros/findDeps/lib +++ b/macros/findDeps/lib diff --git a/macros/getScilab2cVersion.bin b/macros/getScilab2cVersion.bin Binary files differdeleted file mode 100644 index 9620859e..00000000 --- a/macros/getScilab2cVersion.bin +++ /dev/null diff --git a/macros/runsci2c.bin b/macros/runsci2c.bin Binary files differdeleted file mode 100644 index 24c1b902..00000000 --- a/macros/runsci2c.bin +++ /dev/null diff --git a/macros/runsci2c.sci b/macros/runsci2c.sci index f05cb83d..ae38e57f 100644 --- a/macros/runsci2c.sci +++ b/macros/runsci2c.sci @@ -113,7 +113,7 @@ PrintStepInfo('Copying sources', FileInfo.GeneralReport,'both'); for i = 1:size(allSources, "*")
// DEBUG only
- //disp("Copying "+allSources(i)+" in "+SCI2COutputPath+"/src/c/");
+ disp("Copying "+allSources(i)+" in "+SCI2COutputPath+"/src/c/");
//Copy ode related functions only if 'ode' function is used.
if(~isempty(strstr(allSources(i),'dode')))
if(size(SharedInfo.Includelist) <> 0)
@@ -130,7 +130,7 @@ end PrintStepInfo('Copying headers', FileInfo.GeneralReport,'both');
for i = 1:size(allHeaders, "*")
// DEBUG only
- //disp("Copying "+allHeaders(i)+" in "+SCI2COutputPath+"/includes/");
+ disp("Copying "+allHeaders(i)+" in "+SCI2COutputPath+"/includes/");
copyfile(allHeaders(i), SCI2COutputPath+"/includes/");
end
diff --git a/macros/runscicode.bin b/macros/runscicode.bin Binary files differdeleted file mode 100644 index 46bda7cc..00000000 --- a/macros/runscicode.bin +++ /dev/null diff --git a/macros/sci2c_gui.bin b/macros/sci2c_gui.bin Binary files differdeleted file mode 100644 index 57a2f696..00000000 --- a/macros/sci2c_gui.bin +++ /dev/null diff --git a/macros/scilab2c.bin b/macros/scilab2c.bin Binary files differdeleted file mode 100644 index 9fc934f8..00000000 --- a/macros/scilab2c.bin +++ /dev/null diff --git a/macros/scilab2c.sci b/macros/scilab2c.sci index 69d95541..61ac42d3 100644 --- a/macros/scilab2c.sci +++ b/macros/scilab2c.sci @@ -12,6 +12,7 @@ function scilab2c(varargin) [lhs, rhs] = argn(); + disp("YES") select rhs // // scilab2c() @@ -35,6 +36,7 @@ function scilab2c(varargin) RunMode = 'All'; BuildTool = getNativeBuildTool(); Target = "StandAlone" + //Board_name = "uno" // // scilab2c(UserScilabMainFile, CCodeOutputDir, UserSciFilesPaths) // @@ -55,6 +57,7 @@ function scilab2c(varargin) RunMode = "All"; BuildTool = getNativeBuildTool(); Target = "StandAlone" + //Board_name = "uno" // // scilab2c(UserScilabMainFile, CCodeOutputDir, UserSciFilesPaths, RunMode) // @@ -79,6 +82,7 @@ function scilab2c(varargin) RunMode = varargin(4); BuildTool = getNativeBuildTool(); Target = "StandAlone" + //Board_name = "uno" case 5 for i = 1:4 if typeof(varargin(i)) <> "string" @@ -104,6 +108,7 @@ function scilab2c(varargin) RunMode = varargin(4); BuildTool = varargin(5); Target = "StandAlone" + //Board_name = "uno" case 6 for i = 1:4 if typeof(varargin(i)) <> "string" @@ -133,6 +138,7 @@ function scilab2c(varargin) RunMode = varargin(4); BuildTool = varargin(5); Target = varargin(6); + //Board_name = "uno"; case 7 for i = 1:4 if typeof(varargin(i)) <> "string" |