Update our SVN with code submitted to the review

6 files changed, 117 insertions, 127 deletions

diff --git a/src/Scilab2C/Scilab2C/ASTManagement/%program_p.sci b/src/Scilab2C/Scilab2C/ASTManagement/%program_p.sci
index 931f1f17..7ed7832a 100644
--- a/src/Scilab2C/Scilab2C/ASTManagement/%program_p.sci
+++ b/src/Scilab2C/Scilab2C/ASTManagement/%program_p.sci
@@ -148,9 +148,9 @@ function txt=%variable_string(v)
    else
      if (v.name == 'ans')
         anscounter = anscounter + 1;
-        txt=['Variable: '+v.name+string(anscounter)];
+        txt=['Var: '+v.name+string(anscounter)];
      else
-        txt=['Variable: '+v.name];
+        txt=['Var: '+v.name];
      end
   end
 endfunction
diff --git a/src/Scilab2C/Scilab2C/ASTManagement/AST_ExtractNameAndScope.sci b/src/Scilab2C/Scilab2C/ASTManagement/AST_ExtractNameAndScope.sci
index 1aba314e..c2564714 100644
--- a/src/Scilab2C/Scilab2C/ASTManagement/AST_ExtractNameAndScope.sci
+++ b/src/Scilab2C/Scilab2C/ASTManagement/AST_ExtractNameAndScope.sci
@@ -28,7 +28,7 @@ tagname(cnttag)   = 'String:';
 taglength(cnttag) = length(tagname(cnttag));
 
 cnttag = cnttag + 1; 
-tagname(cnttag)   = 'Variable:';
+tagname(cnttag)   = 'Var:';
 taglength(cnttag) = length(tagname(cnttag));
 
 cnttag = cnttag + 1; 
@@ -58,7 +58,7 @@ elseif (SCI2Cstrncmps1size(tagname(2),ASTField))
    ArgScope = 'String';
 elseif (SCI2Cstrncmps1size(tagname(3),ASTField))
    ArgName  = stripblanks(part(ASTField,taglength(3)+1:fieldlength));
-   ArgScope = 'Variable';
+   ArgScope = 'Var';
 elseif (SCI2Cstrncmps1size(tagname(4),ASTField))
    ArgName  = stripblanks(part(ASTField,taglength(4)+1:fieldlength));
    ArgScope = 'Global';
diff --git a/src/Scilab2C/Scilab2C/ASTManagement/AST_HandleHeader.sci b/src/Scilab2C/Scilab2C/ASTManagement/AST_HandleHeader.sci
index e7505bb4..fdb6396a 100644
--- a/src/Scilab2C/Scilab2C/ASTManagement/AST_HandleHeader.sci
+++ b/src/Scilab2C/Scilab2C/ASTManagement/AST_HandleHeader.sci
@@ -36,11 +36,11 @@ end
 TmpInNames  = tokens(ASTHeader.Inputs,' ');
 TmpOutNames = tokens(ASTHeader.Outputs,' ');
 
-// Remove Variable: Number: or String: specifier.
+// Remove Var: Number: or String: specifier.
 NInArg = 0;
 for tmpcnt = 1:size(TmpInNames,1)
    TmpSingleName = TmpInNames(tmpcnt);
-   if ((TmpSingleName == 'Variable:') | ...
+   if ((TmpSingleName == 'Var:') | ...
        (TmpSingleName == 'String:') | ...
        (TmpSingleName == 'Number:'))
        // Skip the specifier.
@@ -50,11 +50,11 @@ for tmpcnt = 1:size(TmpInNames,1)
    end
 end
 
-// Remove Variable: Number: or String: specifier.
+// Remove Var: Number: or String: specifier.
 NOutArg = 0;
 for tmpcnt = 1:size(TmpOutNames,1)
    TmpSingleName = TmpOutNames(tmpcnt);
-   if ((TmpSingleName == 'Variable:') | ...
+   if ((TmpSingleName == 'Var:') | ...
        (TmpSingleName == 'String:')   | ...
        (TmpSingleName == 'Number_x:') | ...
        (TmpSingleName == 'Number_s:') | ...
diff --git a/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc b/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc
index abd20375..406dcbab 100644
--- a/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc
+++ b/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc
@@ -1,70 +1,70 @@
-

-# --- C COMPILER ---

-CC = gcc

-CFLAGS = -Wall -pedantic -O3 -I $(HSRCDIR) -I $(ISRCDIR)

-# ---------------------------

-# --- END USER PARAMETERS ---

-# ---------------------------

-

-# ------------------------------------

-# ------------------------------------

-# ------------------------------------

-# ------------------------------------

-# ------------------------------------

-# DON'T TOUCH ANYTHING BELOW THIS LINE 

-# ------------------------------------

-# ------------------------------------

-# ------------------------------------

-# ------------------------------------

-# ------------------------------------

-

-EXEFILE = $(SCI2CDIR)/$(EXEFILENAME)

-

-SWSRCS	=	\

-	$(CSRCDIR)/doubleComplex.c \

-	$(CSRCDIR)/floatComplex.c \

-	$(CSRCDIR)/RealToComplex.c \

-	$(CSRCDIR)/conj.c \

-	$(CSRCDIR)/disp.c \

-	$(CSRCDIR)/ones.c \

-	$(CSRCDIR)/zeros.c \

-	$(CSRCDIR)/OpApex.c \

-	$(CSRCDIR)/OpColon.c \

-	$(CSRCDIR)/OpDotStar.c \

-	$(CSRCDIR)/OpDotHat.c \

-	$(CSRCDIR)/OpDotSlash.c \

-	$(CSRCDIR)/OpEqual.c \

-	$(CSRCDIR)/OpPlus.c \

-	$(CSRCDIR)/OpMinus.c \

-	$(CSRCDIR)/OpStar.c \

-	$(CSRCDIR)/OpIns.c \

-	$(CSRCDIR)/OpExt.c \

-	$(CSRCDIR)/OpRc.c \

-	$(CSRCDIR)/OpCc.c \

-	$(CSRCDIR)/cos.c \

-	$(CSRCDIR)/cosh.c \

-	$(CSRCDIR)/sin.c \

-	$(CSRCDIR)/sinh.c  \

-	$(CSRCDIR)/FileManagement.c \

-	$(CSRCDIR)/OpLogLt.c \

-	$(CSRCDIR)/OpLogGt.c \

-	$(CSRCDIR)/OpLogGe.c \

-	$(CSRCDIR)/OpLogLe.c \

-	$(CSRCDIR)/OpLogEq.c \

-	$(CSRCDIR)/OpLogOr.c \

-	$(CSRCDIR)/OpLogAnd.c \

-	$(CSRCDIR)/Find.c \

-	$(CSRCDIR)/ConvertPrecision.c \

-	$(CSRCDIR)/SCI2Cfft.c \

-	$(CSRCDIR)/SCI2Cconvol.c \

-	$(CSRCDIR)/ssqrts.c \

-	$(CSRCDIR)/dsqrts.c \

-	$(CSRCDIR)/csqrts.c \

-	$(CSRCDIR)/zsqrts.c \

-	$(CSRCDIR)/ssqrta.c \

-	$(CSRCDIR)/dsqrta.c \

-	$(CSRCDIR)/csqrta.c \

-	$(CSRCDIR)/zsqrta.c \

+
+# --- C COMPILER ---
+CC = gcc
+CFLAGS = -Wall -pedantic -O3 -I $(HSRCDIR) -I $(ISRCDIR) -lm
+# ---------------------------
+# --- END USER PARAMETERS ---
+# ---------------------------
+
+# ------------------------------------
+# ------------------------------------
+# ------------------------------------
+# ------------------------------------
+# ------------------------------------
+# DON'T TOUCH ANYTHING BELOW THIS LINE
+# ------------------------------------
+# ------------------------------------
+# ------------------------------------
+# ------------------------------------
+# ------------------------------------
+
+EXEFILE = $(SCI2CDIR)/$(EXEFILENAME)
+
+SWSRCS	=	\
+	$(CSRCDIR)/doubleComplex.c \
+	$(CSRCDIR)/floatComplex.c \
+	$(CSRCDIR)/RealToComplex.c \
+	$(CSRCDIR)/conj.c \
+	$(CSRCDIR)/disp.c \
+	$(CSRCDIR)/ones.c \
+	$(CSRCDIR)/zeros.c \
+	$(CSRCDIR)/OpApex.c \
+	$(CSRCDIR)/OpColon.c \
+	$(CSRCDIR)/OpDotStar.c \
+	$(CSRCDIR)/OpDotHat.c \
+	$(CSRCDIR)/OpDotSlash.c \
+	$(CSRCDIR)/OpEqual.c \
+	$(CSRCDIR)/OpPlus.c \
+	$(CSRCDIR)/OpMinus.c \
+	$(CSRCDIR)/OpStar.c \
+	$(CSRCDIR)/OpIns.c \
+	$(CSRCDIR)/OpExt.c \
+	$(CSRCDIR)/OpRc.c \
+	$(CSRCDIR)/OpCc.c \
+	$(CSRCDIR)/cos.c \
+	$(CSRCDIR)/cosh.c \
+	$(CSRCDIR)/sin.c \
+	$(CSRCDIR)/sinh.c  \
+	$(CSRCDIR)/FileManagement.c \
+	$(CSRCDIR)/OpLogLt.c \
+	$(CSRCDIR)/OpLogGt.c \
+	$(CSRCDIR)/OpLogGe.c \
+	$(CSRCDIR)/OpLogLe.c \
+	$(CSRCDIR)/OpLogEq.c \
+	$(CSRCDIR)/OpLogOr.c \
+	$(CSRCDIR)/OpLogAnd.c \
+	$(CSRCDIR)/Find.c \
+	$(CSRCDIR)/ConvertPrecision.c \
+	$(CSRCDIR)/SCI2Cfft.c \
+	$(CSRCDIR)/SCI2Cconvol.c \
+	$(CSRCDIR)/ssqrts.c \
+	$(CSRCDIR)/dsqrts.c \
+	$(CSRCDIR)/csqrts.c \
+	$(CSRCDIR)/zsqrts.c \
+	$(CSRCDIR)/ssqrta.c \
+	$(CSRCDIR)/dsqrta.c \
+	$(CSRCDIR)/csqrta.c \
+	$(CSRCDIR)/zsqrta.c \
 	$(CSRCDIR)/sabss.c \
 	$(CSRCDIR)/dabss.c \
 	$(CSRCDIR)/cabss.c \
@@ -101,59 +101,59 @@ SWSRCS	=	\
 	$(CSRCDIR)/dlog1ps.c \
 	$(CSRCDIR)/slog1pa.c \
 	$(CSRCDIR)/dlog1pa.c \
-

+
 #	$(CSRCDIR)/clog10s.c \
 #	$(CSRCDIR)/zlog10s.c \
 #	$(CSRCDIR)/clog10a.c \
 #	$(CSRCDIR)/zlog10a.c \
 #	$(CSRCDIR)/cloga.c \
-#	$(CSRCDIR)/zloga.c \

+#	$(CSRCDIR)/zloga.c \
 #	$(CSRCDIR)/clogs.c \
 #	$(CSRCDIR)/zlogs.c \
 #	$(CSRCDIR)/clog1ps.c \
 #	$(CSRCDIR)/zlog1ps.c \
 #	$(CSRCDIR)/clog1pa.c \
-#	$(CSRCDIR)/zlog1pa.c   
-

+#	$(CSRCDIR)/zlog1pa.c
+
 SWOBJS	=	$(SWSRCS:.c=.o)
-

-# ---------------

-# --- TARGETS ---

-# ---------------

-compileexecute: $(SWOBJS) 

-	@echo " "

-	@echo "============================"

-	@echo "Generation of the executable"

-	@echo "============================"

-	$(CC) $(CFLAGS) $(SWOBJS) $(SCI2CDIR)/*.c -o $(EXEFILE)

-	@echo " "

-	@echo "=============="

-	@echo "Executing code"

-	@echo "=============="

-	$(EXEFILE)

-

-clean:  

-	@echo " "

-	@echo "============================="

-	@echo "Removing only exe + obj files"

-	@echo "============================="

-	rm -rf $(EXEFILE)

-	rm -rf $(SWOBJS)

-	@echo " "

-

-cleanexe:  

-	@echo " "

-	@echo "=========================="

-	@echo "Removing only the exe file"

-	@echo "=========================="

-	rm -rf $(EXEFILE)

-	@echo " "

-

+
+# ---------------
+# --- TARGETS ---
+# ---------------
+compileexecute: $(SWOBJS)
+	@echo " "
+	@echo "============================"
+	@echo "Generation of the executable"
+	@echo "============================"
+	$(CC) $(CFLAGS) $(SWOBJS) $(SCI2CDIR)/*.c -o $(EXEFILE)
+	@echo " "
+	@echo "=============="
+	@echo "Executing code"
+	@echo "=============="
+	$(EXEFILE)
+
+clean:
+	@echo " "
+	@echo "============================="
+	@echo "Removing only exe + obj files"
+	@echo "============================="
+	rm -rf $(EXEFILE)
+	rm -rf $(SWOBJS)
+	@echo " "
+
+cleanexe:
+	@echo " "
+	@echo "=========================="
+	@echo "Removing only the exe file"
+	@echo "=========================="
+	rm -rf $(EXEFILE)
+	@echo " "
+
 # how to compile object code .o from C source files .c (general rule)
 # space between -o and filename for SUN make
-.c.o:		
-	$(CC) $(CFLAGS) -c -o $(@) $<

-

+.c.o:
+	$(CC) $(CFLAGS) -c -o $(@) $<
+
 # Make object code from source
 swobjs:		$(SWOBJS)
-

+
diff --git a/src/Scilab2C/Scilab2C/LaunchRunSCI2C.sci b/src/Scilab2C/Scilab2C/LaunchRunSCI2C.sci
index 3962a675..04c468f0 100644
--- a/src/Scilab2C/Scilab2C/LaunchRunSCI2C.sci
+++ b/src/Scilab2C/Scilab2C/LaunchRunSCI2C.sci
@@ -10,19 +10,9 @@ exec full_reset.sce;
 // --- GENERAL SETTINGS (USER PARAMETERS) ---
 RunsDirectory         = pwd(); // Path of the SCI2CRuns directory
 
-//
-// FIXME : Must be a relative path or user input but neither absolute path. 
-// FIXED : Need to be tested.
-// Bruno, As you can read at the beginning of this file they are user parameters.
-// Anyway, relative paths work well.
-//SCI2CDirectory        = 'D:\NutricatoGAPSVN\PROGETTI_APERTI\POLIBA\hArtes\WP2_SCI2C\Software\Version_alpha\Scilab2C'; // Path of the Scilab2C directory
 SCI2CDirectory        = '.';
 
 // --- SPECIFIC SETTINGS (USER PARAMETERS) ---
-//
-// FIXME : Must be a relative path or user input but neither absolute path.
-// FIXED : Need to be tested.
-//
 SCI2CInputPrmFileName = '../SCI2CTests/test999_WorkingDir/SCI2CInputParameters.sce';
 
 // --- LAUNCH USER SCI CODE TO TEST IT BEFORE TRANSLATING IT!!! ---
diff --git a/src/Scilab2C/Scilab2C/SymbolTable/ST_GetInArgInfo.sci b/src/Scilab2C/Scilab2C/SymbolTable/ST_GetInArgInfo.sci
index 5feb717b..f44ffb7e 100644
--- a/src/Scilab2C/Scilab2C/SymbolTable/ST_GetInArgInfo.sci
+++ b/src/Scilab2C/Scilab2C/SymbolTable/ST_GetInArgInfo.sci
@@ -79,7 +79,7 @@ for cntinarg = 1:NInArg
       
       ST_InsOutArg(UpdatedInArg(cntinarg),1,FileInfo,SharedInfo,'all');
 
-   elseif (tmpscope == 'Variable' | tmpscope == 'Global' | tmpscope == 'Local' | tmpscope == 'Temp')
+   elseif (tmpscope == 'Var' | tmpscope == 'Global' | tmpscope == 'Local' | tmpscope == 'Temp')
       [TBFlagfound,TBType,TBSize,TBValue,TBFindLike,TBDimension,TBScope] = ST_GetSymbolInfo(tmpname,FileInfo,SharedInfo);
       if (TBFlagfound == 0)
          PrintStringInfo(' ',ReportFileName,'both','y');