Fixes for io module.

Author: mcfriend99

apps/nyssa/.blade/libs/qi/app/lib.b

@@ -219,17 +219,21 @@ class expect {
 
     if is_function(self.value) {
       self._run('to throw', e, @(x, y) {
+
+        var res
         catch {
-          x()
+          res = x()
           return false
         } as ex
 
         if ex {
           if is_string(e) return ex.message.match(e)
           if is_class(e) return instance_of(ex, e)
-          if instance_of(e, Exception) and ex == e return true
+          if instance_of(e, Exception) return ex == e
           return true
         }
+
+        return res
       })
     } else {
       self._run('to throw', e, @(x, y) { return false })

tests/io.b renamed to examples/vim.b

@@ -3,8 +3,13 @@ import io
 # simple test
 var tty = io.TTY(io.stdin)
 
-var keywords = ['default', 'def', 'class', 'echo', 'for', 'if', 'in', 
-  'as', 'import', 'let', 'using', 'when', 'while', 'iter', 'raise', 'break', 'continue']
+var keywords = [
+  'and', 'as', 'assert', 'break', 'catch', 'class',
+  'continue', 'def', 'default', 'do', 'echo','else',
+  'false', 'for', 'if', 'import','in', 'iter', 'nil',
+  'or', 'parent','raise', 'return', 'self', 'static',
+  'true', 'using', 'var', 'when', 'while'
+]
 
 def highlight(str) {
   if str.length() == 0
@@ -15,19 +20,18 @@ def highlight(str) {
   return str.replace(regex, '\x1b[32m$1\x1b[0m')
 }
 
-# go full screen by clearning output
-# stdout().write("\x1b[2J");
-# stdout().write("\x1b[H");
+# go full screen by cleaning output
+io.stdout.write("\x1b[2J")
+io.stdout.write("\x1b[H")
 
-print('\x1b[33m')
-print('A simple TTY implementation for Bladey io module demonstration')
-print('Note that your cursor can move left and right.')
-print('Nope! That\'s not how the terminal works by default.')
-print('And we have a few key words too: ' + ', '.join(keywords))
-print('That\'s the power of Bladey!')
-print('Press Ctrl+C to quit')
-print('-------------------------------------------------------------')
-print('\x1b[0m')
+echo '\x1b[33m'
+echo 'A simple TTY based editor with syntax highlighting for Blade using the io module'
+echo 'Note that your cursor can move left and right.'
+echo 'Nope! That\'s not how the terminal works by default.'
+echo 'That\'s the power of Blade!'
+echo 'Press Ctrl+C to quit'
+echo '-------------------------------------------------------------'
+echo '\x1b[0m'
 
 if !tty.set_raw() {
   echo 'Failed to enter raw mode for STDIN'
@@ -40,7 +44,6 @@ var input = ''
 var index = 0
 
 var s
-
 while s = io.stdin.read() {
   if ord(s) == 3 { # ctrl + c
     io.stdout.write('\x1b[1000D\n')
@@ -59,11 +62,11 @@ while s = io.stdin.read() {
     history.append(input)
     history_index++
     # you can take this out to see the output
-    # print('\nechoing...', input)
+    # echo '\nechoing...', input
     input = ''
     index = 0
   } else if ord(s) == 27 { # arrow keys
-    var next1 = ord(io.stdin.read()) 
+    var next1 = ord(io.stdin.read())
     var next2 = ord(io.stdin.read())
     if next1 == 91 {
       if next2 == 68 #left

libs/io.b

@@ -564,18 +564,18 @@ class TTY {
 
   /**
    * Sets the current tty to raw mode.
-   * 
+   *
    * @returns bool
    */
   set_raw() {
-    var new_attr = _io.TTY.tcgetattr(self.std)
+    var new_attr = _io.TTY.tcgetattr(self.std, false)
 
     new_attr[TTY.TTY_IFLAG] &= ~(TTY.IGNBRK | TTY.BRKINT | TTY.PARMRK | TTY.ISTRIP | TTY.INLCR | TTY.IGNCR | TTY.ICRNL | TTY.IXON)
     new_attr[TTY.TTY_OFLAG] &= ~TTY.OPOST
     new_attr[TTY.TTY_LFLAG] &= ~(TTY.ECHO | TTY.ECHONL | TTY.ICANON | TTY.ISIG | TTY.IEXTEN)
     new_attr[TTY.TTY_CFLAG] &= ~(TTY.CSIZE | TTY.PARENB)
     new_attr[TTY.TTY_CFLAG] |= TTY.CS8
-    
+
     return self.set_attr(TTY.TCSAFLUSH, new_attr)
   }
 
@@ -585,7 +585,8 @@ class TTY {
    * @returns bool
    */
   exit_raw() {
-    _io.TTY.exit_raw()
+#     return _io.TTY.exit_raw(self.std)
+    return self.set_attr(TTY.TCSAFLUSH, _io.TTY.tcgetattr(self.std, true))
   }
 
   /**
@@ -655,7 +656,7 @@ def getch() {
 }
 
 /**
- * Reads an entire line from standard input. If a _messagge_ is given, the 
+ * Reads an entire line from standard input. If a _message_ is given, the
  * message will be printed before it begins to wait for a user input. If 
  * _secure_ is `true`, the user's input will not be printing and _obscure_text_ 
  * will be printed instead.

src/bunistd.h

@@ -1,5 +1,5 @@
-#ifndef bladey_compart_unistd_h
-#define bladey_compart_unistd_h
+#ifndef blade_compart_unistd_h
+#define blade_compart_unistd_h
 
 #include "common.h"
 

src/file.c

@@ -215,16 +215,22 @@ DECLARE_FILE_METHOD(read) {
 
   size_t bytes_read = fread(buffer, sizeof(char), file_size, file->file);
 
-  if (bytes_read == 0 && file_size != 0 && file_size == file_size_real) {
+  if (bytes_read == 0 && file_size != 0 && file_size == file_size_real && !file->is_std) {
     FILE_ERROR(Read, "could not read file contents");
   }
 
-  // we made use of +1 so we can terminate the string.
+  if(file->is_std && bytes_read == 0) {
+    RETURN_VALUE(EMPTY_STRING_VAL);
+  }
+
+  // we made use of +1, so we can terminate the string.
   if (buffer != NULL)
     buffer[bytes_read] = '\0';
 
   // close file
-  file_close(file);
+  if(!file->is_std) {
+    file_close(file);
+  }
 
   if (!in_binary_mode) {
     RETURN_T_STRING(buffer, bytes_read);
@@ -294,8 +300,12 @@ DECLARE_FILE_METHOD(gets) {
 
   size_t bytes_read = fread(buffer, sizeof(char), length, file->file);
 
-  if (bytes_read == 0 && length != 0) {
-    FILE_ERROR(Read, "could not read file contents");
+  if (bytes_read == 0 && length != 0 && !file->is_std) {
+    FILE_ERROR(Read, "could not read file contents %d, %d");
+  }
+
+  if(file->is_std && bytes_read == 0) {
+    RETURN_VALUE(EMPTY_STRING_VAL);
   }
 
   // we made use of +1, so we can terminate the string.

src/file.h

@@ -234,6 +234,4 @@ DECLARE_FILE_METHOD(seek);
  */
 DECLARE_FILE_METHOD(tell);
 
-bool is_std_file(b_obj_file *file);
-
 #endif

src/object.h

@@ -279,8 +279,6 @@ static inline bool is_obj_type(b_value v, b_obj_type t) {
   return IS_OBJ(v) && AS_OBJ(v)->type == t;
 }
 
-static inline bool is_std_file(b_obj_file *file) { return file->mode->length == 0; }
-
 #define ALLOCATE_OBJ(type, obj_type)                                           \
   (type *)allocate_object(vm, sizeof(type), obj_type)