From 39b94a01134de71398e83b8b373b218c4ba0e576 Mon Sep 17 00:00:00 2001
From: aNNiMON <annimon119@gmail.com>
Date: Tue, 3 Oct 2023 23:08:18 +0300
Subject: [PATCH] [files] Detailed error message for fopen

---
 .../annimon/ownlang/modules/files/files.java  | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/modules/main/src/main/java/com/annimon/ownlang/modules/files/files.java b/modules/main/src/main/java/com/annimon/ownlang/modules/files/files.java
index 31e1c76..8cfd6f6 100644
--- a/modules/main/src/main/java/com/annimon/ownlang/modules/files/files.java
+++ b/modules/main/src/main/java/com/annimon/ownlang/modules/files/files.java
@@ -124,16 +124,18 @@ public final class files implements Module {
 
         @Override
         public Value execute(Value[] args) {
-            Arguments.checkAtLeast(1, args.length);
+            Arguments.checkOrOr(1, 2, args.length);
             
             final File file = Console.fileInstance(args[0].asString());
             try {
-                if (args.length > 1) {
-                    return process(file, args[1].asString().toLowerCase());
-                }
-                return process(file, "r");
+                final String mode = (args.length == 2)
+                        ? args[1].asString().toLowerCase()
+                        : "r";
+                return process(file, mode);
             } catch (IOException ioe) {
-                return NumberValue.MINUS_ONE;
+                final int key = -files.size() - 1;
+                files.put(key, new FileInfo(ioe.getMessage()));
+                return NumberValue.of(key);
             }
         }
         
@@ -167,8 +169,10 @@ public final class files implements Module {
         public Value execute(Value[] args) {
             if (args.length < 1) throw new ArgumentsMismatchException("File descriptor expected");
             final int key = args[0].asInt();
+            final FileInfo fileInfo = files.get(key);
+            if (key < 0) throw new ArgumentsMismatchException(fileInfo.error);
             try {
-                return execute(files.get(key), args);
+                return execute(fileInfo, args);
             } catch (IOException ioe) {
                 return NumberValue.MINUS_ONE;
             }
@@ -578,12 +582,17 @@ public final class files implements Module {
     
     private static class FileInfo {
         File file;
+        String error;
         DataInputStream dis;
         DataOutputStream dos;
         BufferedReader reader;
         BufferedWriter writer;
 
-        public FileInfo(File file, DataInputStream dis, DataOutputStream dos, BufferedReader reader, BufferedWriter writer) {
+        FileInfo(String errorMessage) {
+            this.error = errorMessage;
+        }
+
+        FileInfo(File file, DataInputStream dis, DataOutputStream dos, BufferedReader reader, BufferedWriter writer) {
             this.file = file;
             this.dis = dis;
             this.dos = dos;