Changeset a5a71d0 for src/examples/fstream_test.c

Timestamp:

Apr 6, 2016, 5:11:32 PM (10 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, with_gc

Children:

eab39cd

Parents:

39786813 (diff), 3aba311 (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:

Merge branch 'fix-memory-error' into ctor

Conflicts:

src/CodeGen/CodeGenerator.cc
src/Makefile.in
src/Parser/DeclarationNode.cc
src/Parser/ParseNode.h
src/Parser/TypeData.cc
src/Parser/parser.cc
src/Parser/parser.yy
src/ResolvExpr/Resolver.cc
src/SymTab/Validate.cc
src/SynTree/Declaration.h
src/SynTree/Mutator.cc
src/SynTree/Mutator.h
src/SynTree/SynTree.h
src/SynTree/Visitor.cc
src/SynTree/Visitor.h
src/libcfa/prelude.cf

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 Feb 17 11:45:43 2016
-// Update Count     : 43
+// Last Modified On : Sun Mar  6 20:58:29 2016
+// Update Count     : 54
 //
 
@@ -18 +18 @@
 int main( void ) {
         int nombre;
-        sout | "Entrez un nombre, s'il vous plaît:\n";
+        sout | "Entrez un nombre, s'il vous plaît:" | endl;
         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 | "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";
+        sout | "Entrez trois nombres, s'il vous plaît: " | endl;
         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;
+        sout | "Vous avez entré" | "i:" | "" | i | "j:" | "" | j | "k:" | "" | k | endl;
 }