Rename callinter.h to callinter.h.f. It was confusing tools and developers. 32/12732/2
Sylvestre Ledru [Sat, 28 Sep 2013 16:12:54 +0000 (18:12 +0200)]
Change-Id: I5adba92e92a28b655bb2360bc9663df86d1e8911

40 files changed:
scilab/Makefile.am
scilab/Makefile.in
scilab/modules/core/includes/callinter.h.f [moved from scilab/modules/core/includes/callinter.h with 100% similarity]
scilab/modules/core/includes/callinterf.h
scilab/modules/core/includes/recursionFunction.h
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/core.vcxproj
scilab/modules/core/src/c/core.vcxproj.filters
scilab/modules/core/src/c/recursionFunction.c
scilab/modules/core/src/c/stack2.c
scilab/modules/core/src/fortran/core_f.vfproj
scilab/modules/core/src/fortran/core_f2c.vcxproj
scilab/modules/core/src/fortran/core_f2c.vcxproj.filters
scilab/modules/core/src/fortran/elementary_functions_f.vfproj
scilab/modules/differential_equations/sci_gateway/fortran/badd.f
scilab/modules/differential_equations/sci_gateway/fortran/bbvode.f
scilab/modules/differential_equations/sci_gateway/fortran/bfeval.f
scilab/modules/differential_equations/sci_gateway/fortran/bint2d.f
scilab/modules/differential_equations/sci_gateway/fortran/bint3d.f
scilab/modules/differential_equations/sci_gateway/fortran/bintg.f
scilab/modules/differential_equations/sci_gateway/fortran/bj2.f
scilab/modules/differential_equations/sci_gateway/fortran/bjac.f
scilab/modules/differential_equations/sci_gateway/fortran/bjacd.f
scilab/modules/differential_equations/sci_gateway/fortran/bpjacd.f
scilab/modules/differential_equations/sci_gateway/fortran/bpsold.f
scilab/modules/differential_equations/sci_gateway/fortran/bresd.f
scilab/modules/differential_equations/sci_gateway/fortran/bresid.f
scilab/modules/differential_equations/sci_gateway/fortran/bsurf.f
scilab/modules/differential_equations/sci_gateway/fortran/bsurfd.f
scilab/modules/differential_equations/sci_gateway/fortran/bydot.f
scilab/modules/differential_equations/sci_gateway/fortran/bydot2.f
scilab/modules/optimization/sci_gateway/fortran/bjlsqrsolv.f
scilab/modules/optimization/sci_gateway/fortran/bjsolv.f
scilab/modules/optimization/sci_gateway/fortran/blsqrsolv.f
scilab/modules/optimization/sci_gateway/fortran/boptim.f
scilab/modules/optimization/sci_gateway/fortran/bsolv.f
scilab/modules/scicos/src/fortran/scifunc.f
scilab/modules/scicos_blocks/src/fortran/sciblk.f
scilab/modules/signal_processing/sci_gateway/fortran/bgetx.f
scilab/modules/signal_processing/sci_gateway/fortran/bgety.f

index 20b34dc..9f8ddba 100644 (file)
@@ -287,13 +287,13 @@ if CODE_COVERAGE
        @if test ! -d $(top_builddir)/coverage/; then \
                mkdir $(top_builddir)/coverage/; \
        fi; \
-       touch $(top_srcdir)/modules/differential_equations/callinter.h $(top_srcdir)/modules/linear_algebra/callinter.h $(top_srcdir)/modules/scicos/callinter.h $(top_srcdir)/modules/scicos_blocks/callinter.h $(top_srcdir)/modules/optimization/callinter.h $(top_srcdir)/modules/signal_processing/callinter.h; \
+       touch $(top_srcdir)/modules/differential_equations/callinter.h.f $(top_srcdir)/modules/linear_algebra/callinter.h.f $(top_srcdir)/modules/scicos/callinter.h.f $(top_srcdir)/modules/scicos_blocks/callinter.h.f $(top_srcdir)/modules/optimization/callinter.h.f $(top_srcdir)/modules/signal_processing/callinter.h.f; \
        $(LCOV) --directory $(top_builddir) --capture --ignore-errors source --output-file $(top_builddir)/coverage/scilab-code-coverage.info; \
        if test ! -f ~/.lcovrc; then echo -e "genhtml_hi_limit = 85\ngenhtml_med_limit = 70" > ~/.lcovrc; fi; \
        $(GENHTML) -o $(top_builddir)/coverage/results/ --show-details --highlight --legend $(top_builddir)/coverage/scilab-code-coverage.info; \
        rm -f $(top_builddir)/coverage/lcovrc; \
        echo "To open the result: firefox  $(top_builddir)/coverage/results/index.html"; \
-       rm -f $(top_srcdir)/modules/differential_equations/callinter.h $(top_srcdir)/modules/linear_algebra/callinter.h $(top_srcdir)/modules/scicos/callinter.h $(top_srcdir)/modules/scicos_blocks/callinter.h $(top_srcdir)/modules/optimization/callinter.h $(top_srcdir)/modules/signal_processing/callinter.h
+       rm -f $(top_srcdir)/modules/differential_equations/callinter.h.f $(top_srcdir)/modules/linear_algebra/callinter.h.f $(top_srcdir)/modules/scicos/callinter.h.f $(top_srcdir)/modules/scicos_blocks/callinter.h.f $(top_srcdir)/modules/optimization/callinter.h.f $(top_srcdir)/modules/signal_processing/callinter.h.f
 #--frames is disable because of : http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=607206
 else
        @echo "Cannot start the code coverage. Add --enable-code-coverage to the ./configure and 'make clean all'."
index e412167..da6714e 100644 (file)
@@ -2076,13 +2076,13 @@ code-coverage:
 @CODE_COVERAGE_TRUE@   @if test ! -d $(top_builddir)/coverage/; then \
 @CODE_COVERAGE_TRUE@           mkdir $(top_builddir)/coverage/; \
 @CODE_COVERAGE_TRUE@   fi; \
-@CODE_COVERAGE_TRUE@   touch $(top_srcdir)/modules/differential_equations/callinter.h $(top_srcdir)/modules/linear_algebra/callinter.h $(top_srcdir)/modules/scicos/callinter.h $(top_srcdir)/modules/scicos_blocks/callinter.h $(top_srcdir)/modules/optimization/callinter.h $(top_srcdir)/modules/signal_processing/callinter.h; \
+@CODE_COVERAGE_TRUE@   touch $(top_srcdir)/modules/differential_equations/callinter.h.f $(top_srcdir)/modules/linear_algebra/callinter.h.f $(top_srcdir)/modules/scicos/callinter.h.f $(top_srcdir)/modules/scicos_blocks/callinter.h.f $(top_srcdir)/modules/optimization/callinter.h.f $(top_srcdir)/modules/signal_processing/callinter.h.f; \
 @CODE_COVERAGE_TRUE@   $(LCOV) --directory $(top_builddir) --capture --ignore-errors source --output-file $(top_builddir)/coverage/scilab-code-coverage.info; \
 @CODE_COVERAGE_TRUE@   if test ! -f ~/.lcovrc; then echo -e "genhtml_hi_limit = 85\ngenhtml_med_limit = 70" > ~/.lcovrc; fi; \
 @CODE_COVERAGE_TRUE@   $(GENHTML) -o $(top_builddir)/coverage/results/ --show-details --highlight --legend $(top_builddir)/coverage/scilab-code-coverage.info; \
 @CODE_COVERAGE_TRUE@   rm -f $(top_builddir)/coverage/lcovrc; \
 @CODE_COVERAGE_TRUE@   echo "To open the result: firefox  $(top_builddir)/coverage/results/index.html"; \
-@CODE_COVERAGE_TRUE@   rm -f $(top_srcdir)/modules/differential_equations/callinter.h $(top_srcdir)/modules/linear_algebra/callinter.h $(top_srcdir)/modules/scicos/callinter.h $(top_srcdir)/modules/scicos_blocks/callinter.h $(top_srcdir)/modules/optimization/callinter.h $(top_srcdir)/modules/signal_processing/callinter.h
+@CODE_COVERAGE_TRUE@   rm -f $(top_srcdir)/modules/differential_equations/callinter.h.f $(top_srcdir)/modules/linear_algebra/callinter.h.f $(top_srcdir)/modules/scicos/callinter.h.f $(top_srcdir)/modules/scicos_blocks/callinter.h.f $(top_srcdir)/modules/optimization/callinter.h.f $(top_srcdir)/modules/signal_processing/callinter.h.f
 #--frames is disable because of : http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=607206
 @CODE_COVERAGE_FALSE@  @echo "Cannot start the code coverage. Add --enable-code-coverage to the ./configure and 'make clean all'."
 
index 2e83937..f04bd70 100644 (file)
@@ -34,7 +34,7 @@
 /* 11 */                                               #include "dynamic_gateways.h" /* optimization */
 /* 12 */                                               #include "../../differential_equations/includes/gw_differential_equations1.h"
 /* 13 */                                               #include "gw_core.h"
-/* 14  gw_user(); RESERVED to gw_user (see callinter.h) */
+/* 14  gw_user(); RESERVED to gw_user (see callinter.h.f) */
 /* 15  gw_user(); FREE */
 /* 16 */                                               #include "../../polynomials/includes/gw_polynomials.h"
 /* 17 */                                               #include "../../data_structures/includes/gw_data_structures1.h"
@@ -44,7 +44,7 @@
 /* 21 */                                               #include "../../string/includes/gw_string.h"
 /* 22 */                                               #include "dynamic_gateways.h" /* symbolic */
 /* 23 */                                               #include "../../boolean/includes/gw_boolean.h"
-/* 24  gw_user2(); RESERVED to gw_user (see callinter.h) */
+/* 24  gw_user2(); RESERVED to gw_user (see callinter.h.f) */
 #include "gw_user2.h"
 /* 25 */                                               #include "../../gui/includes/gw_gui.h"
 /* 26 */                                               #include "../../differential_equations/includes/gw_differential_equations2.h"
index 836a6c1..beaee15 100644 (file)
@@ -16,7 +16,7 @@
 /**
 * PLEASE DO NOT USE RECURSION CALL TO A FUNCTION.
 * ONLY FOR COMPATIBILITY
-* see also callinter.h (fortran part)
+* see also callinter.h.f (fortran part)
 */
 
 #include "machine.h"
index 9b6665d..b6fef9b 100644 (file)
@@ -50,7 +50,7 @@ static OpTab Interfaces[INTERFACES_MAX] =
     /* 11  */ {gw_dynamic_optimization},
     /* 12  */ {gw_differential_equations1},
     /* 13  */ {gw_core},
-    /* 14  */ {gw_user}, /* RESERVED (see callinter.h) */
+    /* 14  */ {gw_user}, /* RESERVED (see callinter.h.f) */
     /* 15  */ {gw_user}, /* free position may be used */
     /* 16  */ {gw_polynomials},
     /* 17  */ {gw_data_structures1},
@@ -60,7 +60,7 @@ static OpTab Interfaces[INTERFACES_MAX] =
     /* 21  */ {gw_string},
     /* 22  */ {gw_dynamic_symbolic},
     /* 23  */ {gw_boolean},
-    /* 24  */ {gw_user2}, /* RESERVED (see callinter.h) */
+    /* 24  */ {gw_user2}, /* RESERVED (see callinter.h.f) */
     /* 25  */ {gw_gui},
     /* 26  */ {gw_differential_equations2},
     /* 27  */ {gw_sparse},
index 9b515b7..3f14135 100644 (file)
@@ -402,7 +402,7 @@ cd ..
     <ClInclude Include="..\..\includes\BOOL.h" />
     <ClInclude Include="callDynamicGateway.h" />
     <ClInclude Include="..\..\includes\callFunctionFromGateway.h" />
-    <ClInclude Include="..\..\includes\callinter.h" />
+    <ClInclude Include="..\..\includes\callinter.h.f" />
     <ClInclude Include="..\..\includes\callinterf.h" />
     <ClInclude Include="..\..\includes\commandwords.h" />
     <ClInclude Include="..\..\includes\core_math.h" />
index fbbfeb4..4a79f70 100644 (file)
     <ClInclude Include="..\..\includes\callFunctionFromGateway.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\includes\callinter.h">
+    <ClInclude Include="..\..\includes\callinter.h.f">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\includes\callinterf.h">
index 27f2020..383b91d 100644 (file)
@@ -16,7 +16,7 @@
 /**
 * PLEASE DO NOT USE RECURSION CALL TO A FUNCTION.
 * ONLY FOR COMPATIBILITY
-* see also callinter.h (fortran part)
+* see also callinter.h.f (fortran part)
 */
 /*--------------------------------------------------------------------------*/
 #define Pt (C2F(recu).pt)
index fd6f478..056bf55 100644 (file)
@@ -2345,7 +2345,7 @@ int C2F(scifunction) (int *number, int *ptr, int *mlhs, int *mrhs)
     C2F(com).fin = *ptr;
     C2F(recu).icall = 5;
     C2F(recu).krec = -1;
-    /* ************************** copied from callinter.h */
+    /* ************************** copied from callinter.h.f */
 L60:
     C2F(parse) ();
     /* parse has exited for a built-in evaluation */
@@ -2675,7 +2675,7 @@ int C2F(scibuiltin) (int *number, int *ifun, int *ifin, int *mlhs, int *mrhs)
     C2F(recu).krec = -1;
     ++C2F(recu).niv;
     goto L90;
-    /* ***************************** copied from callinter.h  */
+    /* ***************************** copied from callinter.h.f  */
 
 L60:
     C2F(parse) ();
index 74496f6..8f597c5 100644 (file)
@@ -46,7 +46,7 @@
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
        <Files>
                <Filter Name="Header Files" Filter="fi;fd">
-               <File RelativePath="..\..\includes\callinter.h"/>
+               <File RelativePath="..\..\includes\callinter.h.f"/>
                <File RelativePath="..\..\includes\stack.h"/></Filter>
                <Filter Name="Library Dependencies">
                <File RelativePath=".\boolean_f_Import.def"/>
index cc94993..708bf5b 100644 (file)
@@ -428,7 +428,7 @@ cd ..
     <ClCompile Include="xerbla.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\includes\callinter.h" />
+    <ClInclude Include="..\..\includes\callinter.h.f" />
     <ClInclude Include="..\..\includes\stack.h" />
   </ItemGroup>
   <ItemGroup>
index e78c0df..be4dc71 100644 (file)
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\includes\callinter.h">
+    <ClInclude Include="..\..\includes\callinter.h.f">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\includes\stack.h">
index d788255..81212f2 100644 (file)
@@ -114,7 +114,7 @@ lib /DEF:&quot;$(InputDir)slatec_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
        <Files>
                <Filter Name="Header Files" Filter="fi;fd">
-               <File RelativePath="..\..\includes\callinter.h"/>
+               <File RelativePath="..\..\includes\callinter.h.f"/>
                <File RelativePath="..\..\includes\stack.h"/></Filter>
                <Filter Name="Library Dependencies"/>
                <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
index 544aa20..e623c0f 100644 (file)
@@ -126,7 +126,7 @@ c
 c     
       icall=5
 c
-      include 'callinter.h'
+      include 'callinter.h.f'
 c     
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
index d612b68..c0ab8ef 100644 (file)
@@ -81,7 +81,7 @@ c     Macro execution
 c     
       icall=5
 
-      include 'callinter.h'
+      include 'callinter.h.f'
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
       pt=pt-1
@@ -182,7 +182,7 @@ c     Macro execution
 c     
       icall=5
 
-      include 'callinter.h'
+      include 'callinter.h.f'
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
       pt=pt-1
@@ -281,7 +281,7 @@ c     Macro execution
 c     
       icall=5
 
-      include 'callinter.h'
+      include 'callinter.h.f'
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
       pt=pt-1
@@ -380,7 +380,7 @@ c     Macro execution
 c     
       icall=5
 
-      include 'callinter.h'
+      include 'callinter.h.f'
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
       pt=pt-1
@@ -476,7 +476,7 @@ c     Macro execution
 c     
       icall=5
 
-      include 'callinter.h'
+      include 'callinter.h.f'
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
       pt=pt-1
index 3d96534..05f0535 100644 (file)
@@ -79,7 +79,7 @@ c
 c     
       icall=5
 
-      include 'callinter.h'
+      include 'callinter.h.f'
 cxxx
 c     
  200  lhs=ids(1,pt)
index 3e2c610..9101c8d 100644 (file)
@@ -112,7 +112,7 @@ c
 c     
       icall=5
 
-      include 'callinter.h'
+      include 'callinter.h.f'
 c     
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
index d64ad50..b1014b9 100644 (file)
@@ -133,7 +133,7 @@ c
 c     
       icall=5
 
-      include 'callinter.h'
+      include 'callinter.h.f'
 c     
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
index 4c6f843..884fcd1 100644 (file)
@@ -111,7 +111,7 @@ c
 c     
       icall=5
 
-      include 'callinter.h'
+      include 'callinter.h.f'
 c     
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
index 1065145..84867dc 100644 (file)
@@ -111,7 +111,7 @@ c
 c     
       icall=5
 
-      include 'callinter.h'
+      include 'callinter.h.f'
 c     
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
index 9313e24..db00e10 100644 (file)
@@ -107,7 +107,7 @@ c
 c     
       icall=5
 
-      include 'callinter.h'
+      include 'callinter.h.f'
 c     
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
index b6ef6e3..17ca611 100644 (file)
@@ -136,7 +136,7 @@ c
 c     
       icall=5
 
-      include 'callinter.h'
+      include 'callinter.h.f'
 c     
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
index e4ef380..dc04994 100644 (file)
@@ -143,7 +143,7 @@ c
       fun=0
 c
       icall=5
-      include 'callinter.h'
+      include 'callinter.h.f'
 c
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
index 39c3e82..0b708b8 100644 (file)
@@ -151,7 +151,7 @@ c
 c
       icall=5
 
-      include 'callinter.h'
+      include 'callinter.h.f'
 c
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
index 9cc92ee..3f81297 100644 (file)
@@ -131,7 +131,7 @@ c
 c     
       icall=5
 
-      include 'callinter.h'
+      include 'callinter.h.f'
 c     
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
index 5497d9f..d608a2d 100644 (file)
@@ -106,7 +106,7 @@ c
 c     
       icall=5
 
-      include 'callinter.h'
+      include 'callinter.h.f'
 c     
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
index 66f3aba..bf4e319 100644 (file)
@@ -123,7 +123,7 @@ c
 c     
       icall=5
 
-      include 'callinter.h'
+      include 'callinter.h.f'
 c     
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
index ebd19ec..62534c9 100644 (file)
@@ -124,7 +124,7 @@ c
 c     
       icall=5
 
-      include 'callinter.h'
+      include 'callinter.h.f'
 c     
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
index 471616c..f6a5fa7 100644 (file)
@@ -111,7 +111,7 @@ c
 c     
       icall=5
 
-      include 'callinter.h'
+      include 'callinter.h.f'
 c     
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
index 19a36e2..7af5659 100644 (file)
@@ -144,7 +144,7 @@ c
 c     
       icall=5
 
-      include 'callinter.h'
+      include 'callinter.h.f'
 c     
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
index 5a0b8dd..6b76a8b 100644 (file)
@@ -130,7 +130,7 @@ c
 c     
       icall=5
 c
-      include "callinter.h"
+      include "callinter.h.f"
 c     
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
index 6d69925..c85022e 100644 (file)
@@ -127,7 +127,7 @@ c
 c     
       icall=5
 c
-      include "callinter.h"
+      include "callinter.h.f"
 c     
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
index 3092f94..39fb544 100644 (file)
@@ -129,7 +129,7 @@ c
 c     
       icall=5
 c
-      include "callinter.h"
+      include "callinter.h.f"
 c======================================================================
 c     this include file contains code relative to interfaces calling. We use
 c     include file instead of subroutine to avoid recursion pb's. This file
index f1e801c..c5e078c 100644 (file)
@@ -113,7 +113,7 @@ c
 c     
       icall=5
 
-      include 'callinter.h'
+      include 'callinter.h.f'
 c     
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
index 3dd0ca0..358647e 100644 (file)
@@ -123,7 +123,7 @@ c
 c     
       icall=5
 c
-      include "callinter.h"
+      include "callinter.h.f"
 c     
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
index 824f8db..77056f8 100644 (file)
@@ -57,7 +57,7 @@ C
 C     
       icall = 5
       krec = -1
-      include "callinter.h"
+      include "callinter.h.f"
  200  lhs = ids(1,pt)
       rhs = ids(2,pt)
       pt = pt - 1
index cd1bed3..0e4967a 100644 (file)
@@ -96,7 +96,7 @@ C
 C     
       icall = 5
       krec = -1
-      include "callinter.h"
+      include "callinter.h.f"
  200  lhs = ids(1,pt)
       rhs = ids(2,pt)
       flag= ids(3,pt)
index ba6ab0e..19d244f 100644 (file)
@@ -74,7 +74,7 @@ c
 c     
       icall=5
 
-      include 'callinter.h'
+      include 'callinter.h.f'
 c     
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)
index f3f5978..7ed3f1b 100644 (file)
@@ -73,7 +73,7 @@ c
 c     
       icall=5
 
-      include 'callinter.h'
+      include 'callinter.h.f'
 c     
  200  lhs=ids(1,pt)
       rhs=ids(2,pt)