Extend StreamFormatting to seperate linewrap and indenting

Author: ChrisJefferson

lib/custom_streams.gi

@@ -343,11 +343,8 @@ InstallMethod( PrintFormattingStatus, "output text custom",
 ##
 InstallMethod( SetPrintFormattingStatus, "output text custom",
         [IsOutputTextCustomRep and IsOutputTextStream,
-         IsBool],
+         IsObject],
         function( str, stat)
-    if stat = fail then
-        Error("Print formatting status must be true or false");
-    else
-        str!.formatting := stat;
-    fi;
+    CheckValidPrintFormattingStatus(stat);
+    str!.formatting := stat;
 end);

lib/streams.gd

@@ -1015,7 +1015,7 @@ DeclareGlobalFunction( "InputOutputLocalProcess" );
 ##  </ManSection>
 ##  <#/GAPDoc>
 ##
-DeclareOperation( "SetPrintFormattingStatus", [IsOutputStream, IsBool] );
+DeclareOperation( "SetPrintFormattingStatus", [IsOutputStream, IsObject] );
 DeclareOperation( "PrintFormattingStatus", [IsOutputStream] );
 
 
@@ -1259,3 +1259,5 @@ DeclareGlobalFunction( "InputFromUser" );
 ##  <#/GAPDoc>
 ##
 DeclareGlobalFunction( "OpenExternal" );
+
+DeclareGlobalFunction( "CheckValidPrintFormattingStatus");

lib/streams.gi

@@ -929,13 +929,10 @@ InstallMethod( PrintFormattingStatus, "output text string",
 ##
 InstallMethod( SetPrintFormattingStatus, "output text string",
         [IsOutputTextStringRep and IsOutputTextStream,
-         IsBool],
+         IsObject],
         function( str, stat)
-    if stat = fail then
-        Error("Print formatting status must be true or false");
-    else
-        str![2] := stat;
-    fi;
+    CheckValidPrintFormattingStatus(stat);
+    str![2] := stat;
 end);
 
 
@@ -1130,13 +1127,10 @@ InstallMethod( PrintFormattingStatus, "output text file",
 ##
 InstallMethod( SetPrintFormattingStatus, "output text file",
         [IsOutputTextFileRep and IsOutputTextStream,
-         IsBool],
+         IsObject],
         function( str, stat)
-    if stat = fail then
-        Error("Print formatting status must be true or false");
-    else
-        str![3] := stat;
-    fi;
+    CheckValidPrintFormattingStatus(stat);
+    str![3] := stat;
 end);
 
 ##  formatting status for stdout or current output
@@ -1151,7 +1145,7 @@ function(str)
   fi;
 end);
 
-InstallOtherMethod( SetPrintFormattingStatus, "for stdout", [IsString, IsBool],
+InstallOtherMethod( SetPrintFormattingStatus, "for stdout", [IsString, IsObject],
 function(str, status)
   if str = "*stdout*" then
     SET_PRINT_FORMATTING_STDOUT(status);
@@ -1255,9 +1249,7 @@ InstallMethod( SetPrintFormattingStatus, "output text none",
         [IsOutputTextNoneRep and IsOutputTextNone,
          IsBool],
         function( str, stat)
-    if stat = fail then
-        Error("Print formatting status must be true or false");
-    fi;
+    CheckValidPrintFormattingStatus(stat);
 end);
 
 
@@ -1676,14 +1668,35 @@ InstallMethod( SetPrintFormattingStatus, "for non-text output stream",
         TryNextMethod();
     fi;
 
-    if stat = true then
-        Error("non-text streams support onlyPrint formatting status false");
-    elif stat = fail then
-        Error("Print formatting status must be true or false");
+    CheckValidPrintFormattingStatus(stat);
+    if (( IsBool(stat) and stat = true ) or 
+        ( IsRecord(stat) and (stat.linewrap or stat.indent) ) ) then
+        Error("non-text streams do not support print formatting");
     fi;
 end);
 
 
+InstallGlobalFunction( "CheckValidPrintFormattingStatus",
+function(fs)
+    local r;
+    if IsBool(fs) then
+        if fs = fail then
+            Error("Formatting status cannot be 'fail'");
+        fi;
+    elif IsRecord(fs) then
+        if Set(RecNames(fs)) <> ["indent", "linewrap"] then
+            Error("Formatting status records must contain only 'indent' and 'linewrap'");
+        fi;
+        for r in ["indent","linewrap"] do
+            if not fs.(r) in [false, true] then
+                Error(Concatenation(r, " must be a Boolean in Formatting status"));
+            fi;
+        od;
+    else
+        Error("Formatting status must be a boolean or a record");
+    fi;
+end);
+
 #############################################################################
 ##
 #M  FileDescriptorOfStream( <iostream-by-pty> )