Adaptation to a toolbox version

3 files changed, 36 insertions, 26 deletions

diff --git a/macros/ToolInitialization/INIT_GenFileInfo.sci b/macros/ToolInitialization/INIT_GenFileInfo.sci
index 0b97af4d..3bb88888 100644
--- a/macros/ToolInitialization/INIT_GenFileInfo.sci
+++ b/macros/ToolInitialization/INIT_GenFileInfo.sci
@@ -37,10 +37,10 @@ FileInfo.UserSciFilesPaths = UserSciFilesPaths;
 // -------------------

 // --- .dat Files. ---

 // -------------------

-FileInfo.FileInfoDatFile       = fullfile(FileInfo.WorkingDir,'FileInfo.dat'); 

-FileInfo.SharedInfoDatFile     = fullfile(FileInfo.WorkingDir,'SharedInfo.dat'); 

+FileInfo.FileInfoDatFile       = fullfile(FileInfo.WorkingDir,'FileInfo.dat');

+FileInfo.SharedInfoDatFile     = fullfile(FileInfo.WorkingDir,'SharedInfo.dat');

 FileInfo.GlobalVarFileName     = fullfile(FileInfo.WorkingDir,'GBLVAR.dat');

-FileInfo.ASTStackDataFile      = fullfile(FileInfo.WorkingDir,'ASTStack.dat'); 

+FileInfo.ASTStackDataFile      = fullfile(FileInfo.WorkingDir,'ASTStack.dat');

 

 // ----------------------

 // --- SCI2C Library. ---

@@ -89,11 +89,11 @@ FileInfo.USER2CLibCFLCls        = fullfile(FileInfo.USER2CLibCFunListDir,'Classe
 // --- Function List. ---

 // ----------------------

 FileInfo.FunctionList.MainDir             = fullfile(FileInfo.WorkingDir,'FunctionList');

-FileInfo.FunctionList.SCI2CAvailableCDat  = fullfile(FileInfo.FunctionList.MainDir,'SCI2CAvailableC.dat'); 

-FileInfo.FunctionList.USER2CAvailableCDat = fullfile(FileInfo.FunctionList.MainDir,'USER2CAvailableC.dat'); 

-FileInfo.FunctionList.ConvertedDat        = fullfile(FileInfo.FunctionList.MainDir,'Converted.dat'); 

-FileInfo.FunctionList.ToBeConvertedDat    = fullfile(FileInfo.FunctionList.MainDir,'ToBeConverted.dat'); 

-FileInfo.FunctionList.FunInfoDatDir       = fullfile(FileInfo.FunctionList.MainDir,'FunInfoDatFiles'); 

+FileInfo.FunctionList.SCI2CAvailableCDat  = fullfile(FileInfo.FunctionList.MainDir,'SCI2CAvailableC.dat');

+FileInfo.FunctionList.USER2CAvailableCDat = fullfile(FileInfo.FunctionList.MainDir,'USER2CAvailableC.dat');

+FileInfo.FunctionList.ConvertedDat        = fullfile(FileInfo.FunctionList.MainDir,'Converted.dat');

+FileInfo.FunctionList.ToBeConvertedDat    = fullfile(FileInfo.FunctionList.MainDir,'ToBeConverted.dat');

+FileInfo.FunctionList.FunInfoDatDir       = fullfile(FileInfo.FunctionList.MainDir,'FunInfoDatFiles');

 

 // --------------------

 // --- Other Files. ---

@@ -103,8 +103,10 @@ FileInfo.GeneralReport = fullfile(FileInfo.WorkingDir,'SCI2CGeneralReport.txt');
 // -----------------------------------

 // --- C-Style paths and Makefile. ---

 // -----------------------------------

-FileInfo.CStyleSCI2CMainDir = ConvertPathMat2C(FileInfo.SCI2CMainDir,SharedInfo.CCompilerPathStyle);

-FileInfo.CStyleOutCCCodeDir = ConvertPathMat2C(OutCCCodeDir,SharedInfo.CCompilerPathStyle);

+//-- FileInfo.CStyleSCI2CMainDir = ConvertPathMat2C(FileInfo.SCI2CMainDir,SharedInfo.CCompilerPathStyle);

+//-- FileInfo.CStyleOutCCCodeDir = ConvertPathMat2C(OutCCCodeDir,SharedInfo.CCompilerPathStyle);

+FileInfo.CStyleSCI2CMainDir = pathconvert(FileInfo.SCI2CMainDir, %f, %f, 'u');

+FileInfo.CStyleOutCCCodeDir = pathconvert(OutCCCodeDir, %f, %f, 'u');

 FileInfo.MakefileFilename   = fullfile(FileInfo.CStyleOutCCCodeDir,'Makefile');

 FileInfo.MakefileTemplate   = fullfile(FileInfo.SCI2CMainDir,'CCodeGeneration','SCI2CMakefileTemplate.rc');

 endfunction

diff --git a/macros/ToolInitialization/INIT_GenSharedInfo.sci b/macros/ToolInitialization/INIT_GenSharedInfo.sci
index b9d8dcef..91f74990 100644
--- a/macros/ToolInitialization/INIT_GenSharedInfo.sci
+++ b/macros/ToolInitialization/INIT_GenSharedInfo.sci
@@ -1,5 +1,4 @@
-function SharedInfo = INIT_GenSharedInfo(WorkingDir,OutCCCodeDir,UserSciFilesPaths,...

-   RunMode,UserScilabMainFile,TotTempScalarVars,EnableTempVarsReuse,Sci2CLibMainHeaderFName)

+function SharedInfo = INIT_GenSharedInfo(RunMode,UserScilabMainFile,TotTempScalarVars,EnableTempVarsReuse,Sci2CLibMainHeaderFName,CopySciCodeIntoCCode)

 // function SharedInfo = INIT_GenSharedInfo(WorkingDir,OutCCCodeDir,UserSciFilesPaths,...

 //    RunMode,UserScilabMainFile,TotTempScalarVars,EnableTempVarsReuse,Sci2CLibMainHeaderFName)

 // -----------------------------------------------------------------

@@ -30,27 +29,31 @@ function SharedInfo = INIT_GenSharedInfo(WorkingDir,OutCCCodeDir,UserSciFilesPat
 // ------------------------------

 // --- Check input arguments. ---

 // ------------------------------

-SCI2CNInArgCheck(argn(2),8,8);

+

+//-- SCI2CNInArgCheck(argn(2),8,8);

 

 

 // ------------------------------

 // --- Initialize SharedInfo. ---

 // ------------------------------

-SharedInfo.CCompilerPathStyle = CCompilerPathStyle;

+//-- SharedInfo.CCompilerPathStyle = CCompilerPathStyle;

 SharedInfo.RunMode = RunMode;

-SharedInfo.Sci2CLibMainHeaderFName = ConvertPathMat2C(Sci2CLibMainHeaderFName,SharedInfo.CCompilerPathStyle);

+//-- SharedInfo.Sci2CLibMainHeaderFName = ConvertPathMat2C(Sci2CLibMainHeaderFName,SharedInfo.CCompilerPathStyle);

+

+//-- FIXME : Must enable this for Makefile generation

+//-- SharedInfo.Sci2CLibMainHeaderFName = pathconvert(Sci2CLibMainHeaderFName, 'u');

 

 // #RNU_RES_B

 // File names of the next .sci files to be converted in AST and

-// successively into C. 

+// successively into C.

 // #RNU_RES_E

-SharedInfo.NextSCIFileName  = UserScilabMainFile; 

+SharedInfo.NextSCIFileName  = UserScilabMainFile;

 [scipath,funname,sciext]    = fileparts(UserScilabMainFile);

 SharedInfo.SCIMainFunName   = funname;

 SharedInfo.CMainFunName     = 'main';

 SharedInfo.NextSCIFunName   = SharedInfo.SCIMainFunName; //NUT: per ora no so cosa metter

 SharedInfo.NextCFunName     = SharedInfo.CMainFunName; //NUT: per ora no so cosa metter //NUT: questo viene aggiornato dalla C_Funcall

-SharedInfo.NextSCIFunNumber = 1; 

+SharedInfo.NextSCIFunNumber = 1;

 SharedInfo.NFilesToTranslate = 1;

 

 

diff --git a/macros/ToolInitialization/INIT_SCI2C.sci b/macros/ToolInitialization/INIT_SCI2C.sci
index c7b7a6f8..522b2a6b 100644
--- a/macros/ToolInitialization/INIT_SCI2C.sci
+++ b/macros/ToolInitialization/INIT_SCI2C.sci
@@ -1,4 +1,5 @@
-function [FileInfoDatFile,SharedInfoDatFile] = INIT_SCI2C(SCI2CInputPrmFile)

+function [FileInfoDatFile,SharedInfoDatFile] = ...

+    INIT_SCI2C(UserScilabMainFile, UserSciFilesPaths, SCI2COutputDir, RunMode)

 // function [FileInfoDatFile,SharedInfoDatFile] = INIT_SCI2C(SCI2CInputPrmFile)

 // -----------------------------------------------------------------

 // #RNU_RES_B

@@ -27,12 +28,12 @@ function [FileInfoDatFile,SharedInfoDatFile] = INIT_SCI2C(SCI2CInputPrmFile)
 // ------------------------------

 // --- Check input arguments. ---

 // ------------------------------

-SCI2CNInArgCheck(argn(2),1,1);

+//SCI2CNInArgCheck(argn(2),1,1);

 

 // ------------------------------

 // --- Read Input Parameters. ---

 // ------------------------------

-exec(SCI2CInputPrmFile);

+//exec(SCI2CInputPrmFile);

 // #RNU_RES_B

 //NUT: queste variabili sono per usi futuri.

 //NUT: e saranno introdotti nel parameter file.

@@ -41,7 +42,7 @@ WorkAreaSizeBytes = 2000*8; // 2000 locations of double
 // #RNU_RES_B

 // Maximum number of temporary scalar variables that can be used.

 // #RNU_RES_E

-TotTempScalarVars = 20; 

+TotTempScalarVars = 20;

 EnableTempVarsReuse = 0; // 0 = Disable; 1 = Enable.

 

 

@@ -49,7 +50,9 @@ EnableTempVarsReuse = 0; // 0 = Disable; 1 = Enable.
 //NUT: I prefer to don't show this parameters to the user.

 // --- Directory where all the products of the SCI2C tool will be stored. ---

 // #RNU_RES_E

-[SCI2CResultDir,tmpfile,tmpext] = fileparts(SCI2CInputPrmFile);

+//-- [SCI2CResultDir,tmpfile,tmpext] = fileparts(SCI2CInputPrmFile);

+SCI2CResultDir = SCI2COutputDir;

+

 

 WorkingDir = fullfile(SCI2CResultDir,'SCI2CTmpResultsReports');

 // #RNU_RES_B

@@ -60,9 +63,11 @@ OutCCCodeDir = fullfile(SCI2CResultDir,'C_Code');
 // ------------------------------

 // --- Initialize SharedInfo. ---

 // ------------------------------

-SharedInfo = INIT_GenSharedInfo(WorkingDir,OutCCCodeDir,UserSciFilesPaths,...

-   RunMode,UserScilabMainFile,TotTempScalarVars,EnableTempVarsReuse,Sci2CLibMainHeaderFName);

-   

+//SharedInfo = INIT_GenSharedInfo(WorkingDir,OutCCCodeDir,UserSciFilesPaths,...

+//   RunMode,UserScilabMainFile,TotTempScalarVars,EnableTempVarsReuse,Sci2CLibMainHeaderFName);

+SharedInfo = INIT_GenSharedInfo(RunMode,UserScilabMainFile, ...

+				TotTempScalarVars,EnableTempVarsReuse,"sci2cincludes/sci2clib.h", %t);

+

 // ----------------------------

 // --- Initialize FileInfo. ---

 // ----------------------------