From 691343859376a690c62f5a1600186dc00f60f55b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20M=2E=20Thi=C3=A9ry?= <nthiery@users.sf.net>
Date: Thu, 11 Dec 2014 11:51:14 +0100
Subject: [PATCH] WIMS: peaufinage

---
 .../src/cpp/read_program.cpp                  | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/test~coding~readingCppPrograms.fr/src/cpp/read_program.cpp b/test~coding~readingCppPrograms.fr/src/cpp/read_program.cpp
index 7e857fe..9fba605 100644
--- a/test~coding~readingCppPrograms.fr/src/cpp/read_program.cpp
+++ b/test~coding~readingCppPrograms.fr/src/cpp/read_program.cpp
@@ -1,10 +1,15 @@
-target=variable if loop function
+target=variable io if loop function vector2D
 
 #if defined TARGET_variable
 #define TARGET variable
 #define TARGET_FR variables
 #endif
 
+#if defined TARGET_io
+#define TARGET io
+#define TARGET_FR Entrées-Sorties
+#endif
+
 #if defined TARGET_if
 #define TARGET if
 #define TARGET_FR conditionnelles
@@ -20,6 +25,11 @@ target=variable if loop function
 #define TARGET_FR fonctions
 #endif
 
+#if defined TARGET_vector2D
+#define TARGET vector2D
+#define TARGET_FR tableaux 2D
+#endif
+
 \title{Deviner l'affichage d'un programme C++ (TARGET_FR)}
 \description{Deviner l'affichage d'un programme C++}
 \language{fr}
@@ -31,10 +41,16 @@ target=variable if loop function
 \text{programs=wims(lookup TARGET in data/index)}
 \text{program=randomitem(\programs)}
 \text{code=wims(record 0 of data/\program)}
-\text{output=wims(lines2words wims(record 0 of data/\program.output))}
+\text{answer=wims(lines2words wims(record 0 of data/\program.answer))}
 \integer{height=wims(linecnt \code)+3}
 \integer{heightpixels=10*\height}
 
+\if{_input.cpp isin \program}{
+\text{answerstyle=text}
+}{
+\text{answerstyle=symtext}
+}
+
 \css{
 <script type="text/javascript" src="scripts/js/edit_area/edit_area_full.js"></script>
 <script type="text/javascript">
@@ -54,13 +70,15 @@ target=variable if loop function
         </script>
 }
 
-
 \statement{
+\if{_input.cpp isin \program}{
+<p>Quel nombre entre 0 et 99 devrait saisir l'utilisateur pour que le programme C++ suivant affiche 42?</p>
+}{
 <p>Quel affichage exact produit le programme C++ suivant?</p>
-
 <p>Les espaces, tabulations et sauts de lignes dans la réponse sont considérés comme équivalents.</p>
+}
 
 <textarea id="wims_show" cols="80" rows="\height" name="wims_show" readonly="readonly">\special{tabs2lines \code}</textarea>
 }
 
-\answer{}{\output}{type=symtext}
+\answer{}{\answer}{type=\answerstyle}
-- 
GitLab