put each SUBTYPE/SUPERTYPE on its own line, indent ONEOF

mpictor · mpictor · commit d4c7d1bf6f0b · 2014-02-20T20:13:36.000-05:00
diff --git a/src/exppp/pretty_entity.c b/src/exppp/pretty_entity.c
@@ -16,6 +16,7 @@
 
 void ENTITY_out( Entity e, int level ) {
     const unsigned int EXPLICIT = 0, DERIVED = 1;
+    int linelen = exppp_linelength;
     bool first_time = true;
 
     first_newline();
@@ -26,6 +27,7 @@ void ENTITY_out( Entity e, int level ) {
     level += exppp_nesting_indent;
     indent2 = level + exppp_continuation_indent;
 
+    exppp_linelength = indent2; /* force newlines */
     if( ENTITYget_abstract( e ) ) {
         if( e->u.entity->subtype_expression ) {
             raw( "\n%*sABSTRACT SUPERTYPE OF ", level, "" );
@@ -55,6 +57,7 @@ void ENTITY_out( Entity e, int level ) {
     }
 
     raw( ";\n" );
+    exppp_linelength = linelen;
 
 #if 0
     /* add a little more space before entities if sub or super appears */
diff --git a/src/exppp/pretty_expr.c b/src/exppp/pretty_expr.c
@@ -125,9 +125,15 @@ void EXPR__out( Expression e, int paren, unsigned int previous_op ) {
             } LISTod
             raw( "]" );
             break;
-        case oneof_:
+        case oneof_: {
+            int old_indent = indent2;
             wrap( "ONEOF ( " );
 
+            if( exppp_linelength == indent2 ) {
+                exppp_linelength += exppp_continuation_indent;
+            }
+            indent2 += exppp_continuation_indent;
+
             i = 0;
             LISTdo( e->u.list, arg, Expression )
             i++;
@@ -137,8 +143,14 @@ void EXPR__out( Expression e, int paren, unsigned int previous_op ) {
             EXPR_out( arg, 0 );
             LISTod
 
+            if( exppp_linelength == indent2 ) {
+                exppp_linelength = old_indent;
+            }
+            indent2 = old_indent;
+
             raw( " )" );
             break;
+        }
         default:
             fprintf( stderr, "%s:%d: ERROR - unknown expression, type %d", e->symbol.filename, e->symbol.line, TYPEis( e->type ) );
             abort();
