diff --git a/test~coding~readingCppPrograms.fr/Makefile b/test~coding~readingCppPrograms.fr/Makefile index e9f8356d96d2e923fa87006b1ce48e89343b987a..c89cd5311ddd7dc984f1ad2b59112dce4e7809b3 100644 --- a/test~coding~readingCppPrograms.fr/Makefile +++ b/test~coding~readingCppPrograms.fr/Makefile @@ -5,6 +5,7 @@ all: data/index $(OUTPUT) data/index: $(PROGRAMS) cd data; \ + if [ -f index ]; then rm index; fi; \ for target in $(TARGETS); do \ (echo "$$target: "`ls -m $${target}_*.cpp`) >> index; \ done @@ -18,6 +19,10 @@ data/%.cpp.bin: data/%.cpp clean: rm data/*.bin data/*.output data/index +# Pour restauration +archive: + cd ..; tar zcvf /tmp/modtool-test~coding~readingCppPrograms.fr.tgz test~coding~readingCppPrograms.fr + #main.oef: header.oef programs/guess-output/*.cpp footer.oef Makefile # cd programs/guess-output; make all.oef # cat header.oef programs/guess-output/all.oef footer.oef > main.oef diff --git a/test~coding~readingCppPrograms.fr/data/function_blackjack.cpp b/test~coding~readingCppPrograms.fr/data/function_blackjack.cpp index 1d5e7ca816d0a39e1c03b334949fa6aa735a533c..624490583a5c133c1b7a65c1a3278dfae5c2cc35 100644 --- a/test~coding~readingCppPrograms.fr/data/function_blackjack.cpp +++ b/test~coding~readingCppPrograms.fr/data/function_blackjack.cpp @@ -39,4 +39,5 @@ int main() { y = 25; cout << max(x,y) << endl; cout << blackJack(x,y) << endl; + return 0; } diff --git a/test~coding~readingCppPrograms.fr/data/if_function.cpp b/test~coding~readingCppPrograms.fr/data/function_if.cpp similarity index 100% rename from test~coding~readingCppPrograms.fr/data/if_function.cpp rename to test~coding~readingCppPrograms.fr/data/function_if.cpp diff --git a/test~coding~readingCppPrograms.fr/data/function_max.cpp b/test~coding~readingCppPrograms.fr/data/function_max.cpp index 3fc83b7903597b8fe8d02422c6c9e09e9808b05f..1c17c8236925970aad1ba6f390d7564c968c732c 100644 --- a/test~coding~readingCppPrograms.fr/data/function_max.cpp +++ b/test~coding~readingCppPrograms.fr/data/function_max.cpp @@ -1,7 +1,7 @@ #include <iostream> using namespace std; -float max(float a, float b) { +double max(double a, double b) { if ( a >= b ) { return a; } else { diff --git a/test~coding~readingCppPrograms.fr/data/loop_count_soustractions.cpp b/test~coding~readingCppPrograms.fr/data/loop_count_subtract.cpp similarity index 100% rename from test~coding~readingCppPrograms.fr/data/loop_count_soustractions.cpp rename to test~coding~readingCppPrograms.fr/data/loop_count_subtract.cpp diff --git a/test~coding~readingCppPrograms.fr/data/loop_indices.cpp b/test~coding~readingCppPrograms.fr/data/loop_indices.cpp index e97c36bbd4d2c1e6e7a2385e4400396c11ae8147..32a59d73aba3d700f27067e6b47bef937519f9d6 100644 --- a/test~coding~readingCppPrograms.fr/data/loop_indices.cpp +++ b/test~coding~readingCppPrograms.fr/data/loop_indices.cpp @@ -8,4 +8,5 @@ int main() { cout << i << endl; i = i + 2; } + return 0; } diff --git a/test~coding~readingCppPrograms.fr/data/loop_indices_2.cpp b/test~coding~readingCppPrograms.fr/data/loop_indices_2.cpp index 72744388f7280d58a5d877e02e6b57c83f7d6894..5f80cf99327585e5eec95121ab218ceea8417ca0 100644 --- a/test~coding~readingCppPrograms.fr/data/loop_indices_2.cpp +++ b/test~coding~readingCppPrograms.fr/data/loop_indices_2.cpp @@ -8,4 +8,5 @@ int main() { cout << i << endl; i = i * 2; } + return 0; } diff --git a/test~coding~readingCppPrograms.fr/data/function_odd.cpp b/test~coding~readingCppPrograms.fr/data/loop_odd.cpp similarity index 100% rename from test~coding~readingCppPrograms.fr/data/function_odd.cpp rename to test~coding~readingCppPrograms.fr/data/loop_odd.cpp diff --git a/test~coding~readingCppPrograms.fr/data/loop_soustractions.cpp b/test~coding~readingCppPrograms.fr/data/loop_substract.cpp similarity index 100% rename from test~coding~readingCppPrograms.fr/data/loop_soustractions.cpp rename to test~coding~readingCppPrograms.fr/data/loop_substract.cpp diff --git a/test~coding~readingCppPrograms.fr/data/loop_syracuse.cpp b/test~coding~readingCppPrograms.fr/data/loop_syracuse.cpp index a97861a1a5b80c40b6b3fd0a5a856d8623212747..a22e0c7566b287ba633f0dfed4a9d8ab1bf1556d 100644 --- a/test~coding~readingCppPrograms.fr/data/loop_syracuse.cpp +++ b/test~coding~readingCppPrograms.fr/data/loop_syracuse.cpp @@ -11,4 +11,5 @@ int main() { i = i/2; } } + return 0; } diff --git a/test~coding~readingCppPrograms.fr/data/variable_assign.cpp b/test~coding~readingCppPrograms.fr/data/variable_assign.cpp index 770df1d380d8925617666c59c546ee3e7302774d..9aa03f0d61cf366e6cf60227a7a5d22d857b5072 100644 --- a/test~coding~readingCppPrograms.fr/data/variable_assign.cpp +++ b/test~coding~readingCppPrograms.fr/data/variable_assign.cpp @@ -21,4 +21,5 @@ int main() { cout << a << " " << b << " " << c << " " << d << endl; c + b; cout << a << " " << b << " " << c << " " << d << endl; + return 0; }