Changeset ae63a18 for src/examples/fstream_test.c

Timestamp:

Dec 18, 2015, 2:56:11 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

8762501

Parents:

baf7fee (diff), c23f807 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

resolving conflicts

File:

• src/examples/fstream_test.c (modified) (2 diffs)

src/examples/fstream_test.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 27 18:13:43 2015
-// Update Count     : 2
+// Last Modified On : Mon Nov 23 14:43:32 2015
+// Update Count     : 40
 //
 
@@ -20 +20 @@
         ifstream *sin = ifstream_stdin();
         int nombre;
-        sout << "Appuyez un nombre, s'il vous plâit:\n";
-        sin >> &nombre;
-        sout << "Vous avez appuyé: " << nombre << "\n";
+        sout | "Entrez un nombre, s'il vous plaît:\n";
+        sin  | &nombre;
+        sout | "Vous avez entré " | nombre | " stocké à l'adresse " | &nombre | endl;
+        sout | "nombre " | nombre | " est "
+                 | (nombre > 0 ? "plus grand que" :
+                   nombre == 0 ? "égal à" : "moins de")
+                 | " zéro" | endl;
+
+        sout | "Entrez trois nombres, s'il vous plaît:\n";
+        int i, j, k;
+        sin  | &i | &j | &k;
+        sout | "Vous avez entré " | "i:" | i | " j:" | j | " k:" | k | endl;
+
+        sout | 3 | ' ' | 3.5 | ' ' | 'a' | ' ' | "abc" | endl;
 }