diff options
| author | yash1112 | 2017-07-07 22:03:16 +0530 |
|---|---|---|
| committer | yash1112 | 2017-07-07 22:03:16 +0530 |
| commit | 69c573fe2e59236f063aaa94dcd44b556f945cbc (patch) | |
| tree | 08fa381bec620e38c7a3d2a34448d30160d861eb /macros/CCodeGeneration/GetClsFileName.sci | |
| parent | 87823db220f4c3b8bee16c0b2e08027704de1efe (diff) | |
| parent | 3f52712f806fbd80d66dfdcaff401e5cf94dcca4 (diff) | |
| download | scilab2c-69c573fe2e59236f063aaa94dcd44b556f945cbc.tar.gz scilab2c-69c573fe2e59236f063aaa94dcd44b556f945cbc.tar.bz2 scilab2c-69c573fe2e59236f063aaa94dcd44b556f945cbc.zip | |
Scilab2C Arduino Updated
Diffstat (limited to 'macros/CCodeGeneration/GetClsFileName.sci')
| -rw-r--r-- | macros/CCodeGeneration/GetClsFileName.sci | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/macros/CCodeGeneration/GetClsFileName.sci b/macros/CCodeGeneration/GetClsFileName.sci index d92a431c..4d899717 100644 --- a/macros/CCodeGeneration/GetClsFileName.sci +++ b/macros/CCodeGeneration/GetClsFileName.sci @@ -45,7 +45,10 @@ if SCI2Cfileexist(FileInfo.USER2CLibCAnnFun,tmpannfilename) // #RNU_RES_B // It is a C function of the USER2C library. // #RNU_RES_E +<<<<<<< HEAD PrintStringInfo('cUser2c',ReportFileName,'file','y'); +======= +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FlagFoundAnnFile = 1; AnnFileName = fullfile(FileInfo.USER2CLibCAnnFun,tmpannfilename); SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName); @@ -54,7 +57,10 @@ elseif SCI2Cfileexist(FileInfo.USER2CLibSCIAnnFun,tmpannfilename) // #RNU_RES_B // It is a scilab function of the USER2C library. // #RNU_RES_E +<<<<<<< HEAD PrintStringInfo('fUser2c',ReportFileName,'file','y'); +======= +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FlagFoundAnnFile = 1; AnnFileName = fullfile(FileInfo.USER2CLibSCIAnnFun,tmpannfilename); SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName); @@ -63,7 +69,10 @@ elseif (SCI2Cfileexist(FileInfo.SCI2CLibCAnnFun,tmpannfilename)) // #RNU_RES_B // It is a C function of the SCI2C library. // #RNU_RES_E +<<<<<<< HEAD PrintStringInfo('csci2c',ReportFileName,'file','y'); +======= +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FlagFoundAnnFile = 1; AnnFileName = fullfile(FileInfo.SCI2CLibCAnnFun,tmpannfilename); SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName); @@ -72,7 +81,10 @@ elseif (SCI2Cfileexist(FileInfo.SCI2CLibSCIAnnFun,tmpannfilename)) // #RNU_RES_B // It is a scilab function of the SCI2C library. // #RNU_RES_E +<<<<<<< HEAD PrintStringInfo('fsci2c',ReportFileName,'file','y'); +======= +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FlagFoundAnnFile = 1; AnnFileName = fullfile(FileInfo.SCI2CLibSCIAnnFun,tmpannfilename); SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName); |