Index: tests/.expect/fstream_test.txt =================================================================== --- tests/.expect/fstream_test.txt (revision 73abe950d807eab747c9e14353b158fcca827308) +++ tests/.expect/fstream_test.txt (revision 524ed86476e43c6c764a1b5335fc8d4fd281dacd) @@ -2,4 +2,4 @@ Vous avez entré -2 le nombre -2 est négatif -Entrez trois nombres, s'il vous plaît: +Entrez trois nombres, s'il vous plaît: Vous avez entré i:2 j:3 k:4 Index: tests/.expect/io1.txt =================================================================== --- tests/.expect/io1.txt (revision 73abe950d807eab747c9e14353b158fcca827308) +++ tests/.expect/io1.txt (revision 524ed86476e43c6c764a1b5335fc8d4fd281dacd) @@ -8,5 +8,5 @@ closing delimiters -1, x 2. x 3; x 4! x 5? x 6% x 7¢ x 8» x 9) x 10] x 11} x +1, x 2. x 3; x 4! x 5? x 6% x 7 ¢ x 8 » x 9) x 10] x 11} x opening/closing delimiters Index: tests/Makefile.in =================================================================== --- tests/Makefile.in (revision 73abe950d807eab747c9e14353b158fcca827308) +++ tests/Makefile.in (revision 524ed86476e43c6c764a1b5335fc8d4fd281dacd) @@ -307,11 +307,4 @@ fstream_test_SOURCES = fstream_test.c avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c - -# SKULLDUGGERY like libcfa/Makefile.am prevent extensionless headers from being generated -# however, here it is more complicated because it must match the dependencies based on how -# they are generated by gcc -headers = $(shell find $(top_srcdir)/libcfa/src -type f ! -name "*.*") -headers_real = $(shell realpath --relative-to=$(top_srcdir)/libcfa/src $(headers)) -headers_deps = $(addprefix %/, $(headers_real)) all: all-am @@ -618,4 +611,5 @@ .INTERMEDIATE: .validate .validate.c +#---------------------------------------------------------------------------------------------------------------- all-local : @+${TEST_PY} --debug=${debug} ${concurrent} ${quick_test} @@ -638,10 +632,6 @@ concurrency : @+${TEST_PY} --debug=${debug} -Iconcurrent -$(headers_deps) : - echo "Dummy rule, should never be called" - -# %/stdlib: -# echo "Dummy rule, should never be called" - + +#---------------------------------------------------------------------------------------------------------------- # implicit rule so not all test require a rule % : %.c $(CC) Index: tests/coroutine/.expect/fmtLines.txt =================================================================== --- tests/coroutine/.expect/fmtLines.txt (revision 73abe950d807eab747c9e14353b158fcca827308) +++ tests/coroutine/.expect/fmtLines.txt (revision 524ed86476e43c6c764a1b5335fc8d4fd281dacd) @@ -1,78 +1,79 @@ -// / / Cf oral l Ve rsio -n 1. 0.0 Copy righ t (C -) 20 17 U nive rsit y of - Wat erlo o/// / Th e co -nten ts o f th is f ile -are cove red unde r th -e li cenc e ag reem ent -in t he// fil e "L ICEN -CE" dist ribu ted with - Cfo rall .// // f mtLi -nes. cc - - // // Auth -or : P eter - A. Buhr // C reat ed O -n : Su n Se p 17 - 21: 56:1 5 20 17// Las -t Mo difi ed B y : Pete -r A. Buh r// Last Mod -ifie d On : M on S ep 1 -8 11 :35: 57 2 017/ / Up -date Cou nt : 31/ -/ #i nclu de < fstr eam> -#inc lude -coro utin e Fo rmat { c -har ch; // - use d fo r co mmun icat -ion int g, b ; - // g loba l be caus -e us ed i n de stru ctor -};vo id ? {}( Form at & - fmt ) { resu me( -fmt ); // s -tart cor outi ne}v oid -^?{} ( Fo rmat & f mt ) - { if ( f mt.g != -0 || fmt .b ! = 0 ) so -ut | end l;}v oid main -( Fo rmat & f mt ) { f -or ( ;; ) { - // for as m any char -acte rs for ( fm t.g -= 0; fmt .g < 5; fmt. -g += 1 ) { // g roup -s of 5 b lock s for -( fm t.b = 0; fmt .b < - 4; fmt. b += 1 ) { / -/ bl ocks of 4 ch arac -ters for ( ;; ) { - / / fo r ne wlin -e ch arac ters sus -pend (); if ( fmt -.ch != ' \n' ) br eak; - // ign ore newl ine - } // for s out -| fm t.ch ; // p -rint cha ract er } / -/ fo r sout | " "; - // p rint blo -ck s epar ator } // f -or sout | e ndl; - // prin t gr oup -sepa rato r } // f or} -// m ainv oid prt( For -mat & fm t, c har ch ) - { fm t.ch = c h; - re sume ( fm t ); } // - prt int main () { For -mat fmt; cha r ch ; fo -r ( ;; ) { sin | ch -; / / re ad o -ne c hara cter i f ( -eof( sin ) ) bre ak; - // eof ? prt( - fmt , ch ); } // for -} // mai n// Loca l Va -riab les: /// / ta b-wi -dth: 4 / /// comp ile- -comm and: "cf a fm tLin -es.c " // // E nd: // +//// Cfo rall Ver sion + 1.0 .0 C opyr ight (C) + 201 7 Un iver sity of +Wate rloo //// The con +tent s of thi s fi le a +re c over ed u nder the + lic ence agr eeme nt i +n th e// file "LI CENC +E" d istr ibut ed w ith +Cfor all. //// fmt Line +s.cc --/ /// Auth or + : P eter A. +Buhr // C reat ed O n + : Su n Se p 17 21: +56:1 5 20 17// Las t Mo +difi ed B y : Pete r A. + Buh r// Last Mod ifie +d On : M on S ep 1 8 11 +:35: 57 2 017/ / Up date + Cou nt : 31/ /#in +clud e # +incl ude c orou tine For mat +{ ch ar c h; + // used for com muni +cati on i nt g , b; + / / gl obal bec +ause use d in des truc +tor} ;voi d ?{ }( F orma +t & fmt ) { r esum +e( f mt ) ; / +/ st art coro utin e}vo +id ^ ?{}( For mat & fm +t ) { if ( fm t.g +!= 0 || fmt. b != 0 ) + sou t | endl ;}vo id m +ain( For mat & fm t ) +{ fo r ( ;; ) { + // f or a s ma ny c +hara cter s f or ( fmt +.g = 0; fmt. g < 5; f +mt.g += 1 ) { / / gr +oups of 5 bl ocks f +or ( fmt .b = 0; fmt. +b < 4; f mt.b += 1 ) +{ // blo cks of 4 cha +ract ers f or ( ;; +) { // for new +line cha ract ers +susp end( ); i f ( +fmt. ch ! = '\ n' ) bre +ak; // igno re n ewli +ne } // f or so +ut | fmt .ch; / +/ pr int char acte r +} // for s out | " + "; / / pr int +bloc k se para tor } / +/ fo r s out | en dl; + // p rint gro +up s epar ator } / / fo +r} / / ma invo id p rt( +Form at & fmt , ch ar c +h ) { fmt .ch = ch +; res ume( fmt );} + // prti nt m ain( ) { +Form at f mt; char ch; + for ( ; ; ) { s in | + ch; // rea +d on e ch arac ter if + ( e of( sin ) ) brea +k; // eof ? p +rt( fmt, ch ); } // +for} // main // L ocal + Var iabl es: //// tab +-wid th: 4 // // c ompi +le-c omma nd: "cfa fmt +Line s.c" /// / En d: / +/ Index: tests/fstream_test.c =================================================================== --- tests/fstream_test.c (revision 73abe950d807eab747c9e14353b158fcca827308) +++ tests/fstream_test.c (revision 524ed86476e43c6c764a1b5335fc8d4fd281dacd) @@ -18,14 +18,14 @@ int main( void ) { int nombre; - sout | "Entrez un nombre, s'il vous pla�t:" | endl; + sout | "Entrez un nombre, s'il vous plaît:" | endl; sin | nombre; - sout | "Vous avez entr�" | nombre | endl; + sout | "Vous avez entré" | nombre | endl; sout | "le nombre" | nombre | "est" - | (nombre > 0 ? "positif" : nombre == 0 ? "z�ro" : "n�gatif") | endl; + | (nombre > 0 ? "positif" : nombre == 0 ? "zéro" : "négatif") | endl; - sout | "Entrez trois nombres, s'il vous pla�t: " | endl; + 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 | "Vous avez entré" | "i:" | "" | i | "j:" | "" | j | "k:" | "" | k | endl; } Index: tests/io1.c =================================================================== --- tests/io1.c (revision 73abe950d807eab747c9e14353b158fcca827308) +++ tests/io1.c (revision 524ed86476e43c6c764a1b5335fc8d4fd281dacd) @@ -31,9 +31,9 @@ | "x =" | 4 | "x $" | 5 - | "x �" | 6 - | "x �" | 7 - | "x �" | 8 - | "x �" | 9 - | "x �" | 10 + | "x £" | 6 + | "x ¥" | 7 + | "x ¡" | 8 + | "x ¿" | 9 + | "x «" | 10 | endl | endl; @@ -46,6 +46,6 @@ | 5 | "? x" | 6 | "% x" - | 7 | "� x" - | 8 | "� x" + | 7 | "¢ x" + | 8 | "» x" | 9 | ") x" | 10 | "] x" Index: tests/maybe.c =================================================================== --- tests/maybe.c (revision 73abe950d807eab747c9e14353b158fcca827308) +++ tests/maybe.c (revision 524ed86476e43c6c764a1b5335fc8d4fd281dacd) @@ -15,5 +15,5 @@ #include -#include +#include void checkPredicates() { Index: tests/result.c =================================================================== --- tests/result.c (revision 73abe950d807eab747c9e14353b158fcca827308) +++ tests/result.c (revision 524ed86476e43c6c764a1b5335fc8d4fd281dacd) @@ -15,5 +15,5 @@ #include -#include +#include void checkPredicates() { Index: tests/time.c =================================================================== --- tests/time.c (revision 73abe950d807eab747c9e14353b158fcca827308) +++ tests/time.c (revision 524ed86476e43c6c764a1b5335fc8d4fd281dacd) @@ -14,5 +14,5 @@ // -#include "time" +#include "time.hfa" #include