kernel: don't call CloseInput in READ_AS_FUNC

... to ensure that all CloseInput() calls are in the same function
as the corresponding OpenInput/OpenInputStream invocation.

src/gap.c

@@ -427,6 +427,9 @@ int realmain( int argc, char * argv[] )
         return 1;
       }
       func = READ_AS_FUNC();
+      if (!CloseInput()) {
+          return 2;
+      }
       crc  = SyGAPCRC(SyCompileInput);
       type = CompileFunc(
                          MakeImmString(SyCompileOutput),

src/streams.c

@@ -356,16 +356,11 @@ Obj READ_AS_FUNC ( void )
     ClearError();
     Obj evalResult;
     UInt type = ReadEvalFile(&evalResult);
+    ClearError();
 
     /* get the function                                                    */
     Obj func = (type == 0) ? evalResult : Fail;
 
-    /* close the input file again, and return 'true'                       */
-    if ( ! CloseInput() ) {
-        ErrorQuit("Panic: READ_AS_FUNC cannot close input", 0, 0);
-    }
-    ClearError();
-
     /* return the function                                                 */
     return func;
 }
@@ -952,8 +947,11 @@ static Obj FuncREAD_AS_FUNC(Obj self, Obj input)
     if (!OpenInputFileOrStream(SELF_NAME, input))
         return False;
 
-    /* read the function                                                   */
-    return READ_AS_FUNC();
+    Obj func = READ_AS_FUNC();
+    if (!CloseInput()) {
+        ErrorQuit("Panic: READ_AS_FUNC cannot close input", 0, 0);
+    }
+    return func;
 }
 
 

src/streams.h

@@ -26,7 +26,8 @@
 **
 *F  READ_AS_FUNC()  . . . . . . . . . . . . .  read current input as function
 **
-**  Read the current input as function and close the input stream.
+**  Read the current input as function. The caller is responsible for opening
+**  and closing the input.
 */
 Obj READ_AS_FUNC(void);