printer: improve object formatting.

There is an issue with the printer in that it produces
output whereby objects continue on the same line after
a multi-line object, e.g:

   (foo (foobly bar
         xyzzy quux) (oops same
                      line))

rather than:

   (foo (foobly bar
         xyzzy quux)
        (oops same line))

There is a simple fix for this: set a flag to force
a line break on the next width-check operation whenever
an object has been broken into multiple lines.

width-check can return a Boolean indication whether
it generated a line break, and so aggregate object
printing routines can tell whether their object
has been broken into lines, and set the flag.

* stream.h (struct strm_base): New member, force_break.
(force_break): Declared.

* stream.c (strm_base_init): Extent initializer to cover
force_break flag.
(put_string, put_char): Clear the force_break flag whenever
we hit column zero.
(width_check): If indent mode is on, and force_break is
true, generate a break. Clear force_break.
(force_break): New function.
(stream_init): Register force-break intrinsic.

* buf.c (buf_print): Set the force break flag if the buffer
was broken into multiple lines.

* hash.c (hash_print_op): Set the force break flag if the
hash was broken into multiple lines.

* lib.c (obj_print_impl): Same logic for lists.

* struct.c (struct_inst_print): Same logic for structs.

* tests/009/json.expected, tests/011/macros-2.expected,
tests/012/struct.tl, tests/017/glob-zarray.expected:
Update expected textual output to reflect new formatting.

1 files changed, 5 insertions, 3 deletions

diff --git a/tests/009/json.expected b/tests/009/json.expected
index 8bc4ab9a..8c3fc4c6 100644
--- a/tests/009/json.expected
+++ b/tests/009/json.expected
@@ -19,8 +19,9 @@ AST: #H(() ("web-app" #H(() ("servlet-mapping" #H(() ("cofaxTools" "/tools/*") (
                                                                                                           ("dataStoreUrl" "jdbc:microsoft:sqlserver://LOCALHOST:1433;DatabaseName=goon")
                                                                                                           ("useDataStore" :true) ("cachePackageTagsTrack" 200.0) ("searchEngineFileTemplate" "forSearchEngines.htm")
                                                                                                           ("cachePackageTagsStore" 200.0) ("cachePagesRefresh" 10.0)))
-                                         ("servlet-name" "cofaxCDS")) #H(() ("servlet-class" "org.cofax.cds.EmailServlet") ("init-param" #H(() ("mailHost" "mail1") ("mailHostOverride" "mail2")))
-                                                                         ("servlet-name" "cofaxEmail"))
+                                         ("servlet-name" "cofaxCDS"))
+                                      #H(() ("servlet-class" "org.cofax.cds.EmailServlet") ("init-param" #H(() ("mailHost" "mail1") ("mailHostOverride" "mail2")))
+                                         ("servlet-name" "cofaxEmail"))
                                       #H(() ("servlet-class" "org.cofax.cds.AdminServlet") ("servlet-name" "cofaxAdmin"))
                                       #H(() ("servlet-class" "org.cofax.cds.FileServlet") ("servlet-name" "fileServlet"))
                                       #H(() ("servlet-class" "org.cofax.cms.CofaxToolsServlet") ("init-param" #H(() ("lookInContext" 1.0) ("removePageCache" "/content/admin/remove?cache=pages&id=")
@@ -29,7 +30,8 @@ AST: #H(() ("web-app" #H(() ("servlet-mapping" #H(() ("cofaxTools" "/tools/*") (
                                                                                                                  ("log" 1.0) ("adminGroupID" 4.0) ("templatePath" "toolstemplates/")
                                                                                                                  ("betaServer" :true) ("dataLogLocation" "/usr/local/tomcat/logs/dataLog.log")
                                                                                                                  ("fileTransferFolder" "/usr/local/tomcat/webapps/content/fileTransferFolder")))
-                                         ("servlet-name" "cofaxTools")))) ("taglib" #H(() ("taglib-uri" "cofax.tld") ("taglib-location" "/WEB-INF/tlds/cofax.tld"))))))
+                                         ("servlet-name" "cofaxTools"))))
+                         ("taglib" #H(() ("taglib-uri" "cofax.tld") ("taglib-location" "/WEB-INF/tlds/cofax.tld"))))))
 
 Unmatched junk: ""