3 files changed, 15 insertions, 18 deletions
diff --git a/src/Scilab2C/FunctionTableManagement/GenerateLibTrees.sci b/src/Scilab2C/FunctionTableManagement/GenerateLibTrees.sci
index 0ccd9f43..32e1648b 100644
--- a/src/Scilab2C/FunctionTableManagement/GenerateLibTrees.sci
+++ b/src/Scilab2C/FunctionTableManagement/GenerateLibTrees.sci
@@ -1,5 +1,5 @@
-function GenerateLibTrees(FileInfoDatFile,SharedInfoDatFile);
-// function GenerateLibTrees(FileInfoDatFile,SharedInfoDatFile);
+function GenerateLibTrees(FileInfoDatFile);
+// function GenerateLibTrees(FileInfoDatFile);
 // -----------------------------------------------------------------
 // This function generates the SCI2C and USER2C library trees.
 // Library trees contain detailed information of the DSP functions
@@ -19,6 +19,15 @@ function GenerateLibTrees(FileInfoDatFile,SharedInfoDatFile);
 // 11-Apr-2007 -- Nutricato Raffaele: Author.
 // -----------------------------------------------------------------
 
+// ---------------------
+// --- Load section. ---
+// ---------------------
+// --- Load File Info Structure. ---
+load(FileInfoDatFile,'FileInfo');
+// -------------------------
+// --- End load section. ---
+// -------------------------
+
 [SCI2CLibTree, USER2CLibTree] = InitializeLibraryTrees(FileInfoDatFile);
 
 load(FileInfoDatFile,'FileInfo');
diff --git a/src/Scilab2C/FunctionTableManagement/GetCFunCall.sci b/src/Scilab2C/FunctionTableManagement/GetCFunCall.sci
index d95c7493..8d3958ce 100644
--- a/src/Scilab2C/FunctionTableManagement/GetCFunCall.sci
+++ b/src/Scilab2C/FunctionTableManagement/GetCFunCall.sci
@@ -19,7 +19,7 @@ for counterinput = 1:NInputs
    else 
       TreeAccessString = TreeAccessString+".A";   
    end
-   
+
    if InArg(counterinput).Type == "s"
       TreeAccessString = TreeAccessString+".R.F";
    elseif InArg(counterinput).Type == "d"
@@ -29,13 +29,14 @@ for counterinput = 1:NInputs
    elseif InArg(counterinput).Type == "z"
       TreeAccessString = TreeAccessString+".C.D";
    else
-      error("Unknown input argument type");
+      SCI2Cerror("Unknown input argument type");
    end
 end
 
 CFunName = FunTree+"."+TreeAccessString+".CINFO("+mtlb_num2str(NOutputs)+").NAME";
 CFunArgList = FunTree+"."+TreeAccessString+".CINFO("+mtlb_num2str(NOutputs)+").ARGLIST";
 
-CFunCall = [eval(CFunName),"(",eval(eval(CFunArgList)),")"];
+CFunCall = [eval(CFunName),'(',eval(eval(CFunArgList)),');'];
+
 // CFunCall = [execstr(CFunName),"(",eval(eval(CFunArgList)),")"];
 endfunction
diff --git a/src/Scilab2C/FunctionTableManagement/Pass1ASTReader.txt b/src/Scilab2C/FunctionTableManagement/Pass1ASTReader.txt
deleted file mode 100644
index c235731b..00000000
--- a/src/Scilab2C/FunctionTableManagement/Pass1ASTReader.txt
+++ /dev/null
@@ -1,13 +0,0 @@
- 
- 
-__temp1 = x * 2;
-__temp1 = 3 + __temp1;
-y = __temp1;
- 
-Result = return(<empty>)
- 
-zcoss
-zcoss
-zcoss
-zcosa
-zcosa