Revert "repl: readline line editing "

This reverts commit 1956c6f906.

vlib/compiler/repl.v

@@ -4,11 +4,8 @@
 
 module compiler
 
-import (
-	os
-	term
-	readline
-)
+import os
+import term
 
 struct Repl {
 mut:
@@ -84,27 +81,22 @@ pub fn run_repl() []string {
 		os.rm(temp_file.left(temp_file.len - 2))
 	}
 	mut r := Repl{}
-	mut readline := readline.Readline{}
 	vexe := os.args[0]
-	mut prompt := '>>> '
 	for {
 		if r.indent == 0 {
-			prompt = '>>> '
+			print('>>> ')
 		}
 		else {
-			prompt = '... '
+			print('... ')
 		}
-		mut line := readline.read_line(prompt) or {
-				break
-		}
-		if line.trim_space() == '' && line.ends_with('\n') {
+		r.line = os.get_raw_line()
+		if r.line.trim_space() == '' && r.line.ends_with('\n') {
 			continue
 		}
-		line = line.trim_space()
-		if line.len <= -1 || line == '' || line == 'exit' {
+		r.line = r.line.trim_space()
+		if r.line.len == -1 || r.line == '' || r.line == 'exit' {
 			break
 		}
-		r.line = line
 		if r.line == '\n' {
 			continue
 		}

vlib/readline/readline_js.v

@@ -1,66 +0,0 @@
-// Copyright (c) 2019 Alexander Medvednikov. All rights reserved.
-// Use of this source code is governed by an MIT license
-// that can be found in the LICENSE file.
-
-// JS version
-// Need to be implemented
-// Will serve as more advanced input method
-// Based on the work of https://github.com/AmokHuginnsson/replxx
-
-module readline
-
-import os
-
-// Only use standard os.get_line
-// Need implementation for readline capabilities
-pub fn (r mut Readline) read_line_utf8(prompt string) ?ustring {
-  r.current = ''.ustring()
-  r.cursor = 0
-  r.prompt = prompt
-  r.search_index = 0
-  if r.previous_lines.len <= 1 {
-    r.previous_lines << ''.ustring()
-    r.previous_lines << ''.ustring()
-  }
-  else {
-    r.previous_lines[0] = ''.ustring()
-  }
-
-  print(r.prompt)
-  r.current = os.get_raw_line().ustring()
-
-  r.previous_lines[0] = ''.ustring()
-  r.search_index = 0
-  if r.current.s == '' {
-    return error('empty line')
-  }
-  return r.current
-}
-
-// Returns the string from the utf8 ustring
-pub fn (r mut Readline) read_line(prompt string) ?string {
-  s := r.read_line_utf8(prompt) or {
-    return error(err)
-  }
-  return s.s
-}
-
-// Standalone function without persistent functionnalities (eg: history)
-// Returns utf8 based ustring
-pub fn read_line_utf8(prompt string) ?ustring {
-  mut r := Readline{}
-  s := r.read_line_utf8(prompt) or {
-    return error(err)
-  }
-  return s
-}
-
-// Standalone function without persistent functionnalities (eg: history)
-// Return string from utf8 ustring
-pub fn read_line(prompt string) ?string {
-  mut r := Readline{}
-  s := r.read_line(prompt) or {
-    return error(err)
-  }
-  return s
-}

vlib/readline/readline_lin.v

@@ -149,7 +149,7 @@ pub fn read_line(prompt string) ?string {
   return s
 }
 
-fn (r Readline) analyse(c int) Action {
+fn (r Readline) analyse(c byte) Action {
   switch c {
     case `\0`: return Action.eof
     case 0x3 : return Action.eof // End of Text
@@ -295,9 +295,7 @@ fn (r mut Readline) refresh_line() {
 fn (r mut Readline) eof() bool {
   r.previous_lines.insert(1, r.current)
   r.cursor = r.current.len
-  if r.is_tty {
   r.refresh_line()
-  }
   return true
 }
 
@@ -339,8 +337,8 @@ fn (r mut Readline) commit_line() bool {
   a := '\n'.ustring()
   r.current = r.current + a
   r.cursor = r.current.len
-  if r.is_tty {
   r.refresh_line()
+  if r.is_tty {
     println('')
   }
   return true

vlib/readline/readline_mac.v

@@ -29,11 +29,8 @@ pub fn (r mut Readline) read_line_utf8(prompt string) ?ustring {
   }
 
   print(r.prompt)
-  line := os.get_raw_line()
+  r.current = os.get_line().ustring()
 
-  if line.len >= 0 {
-    r.current = line.ustring()
-  }
   r.previous_lines[0] = ''.ustring()
   r.search_index = 0
   if r.current.s == '' {

vlib/readline/readline_win.v

@@ -27,7 +27,7 @@ pub fn (r mut Readline) read_line_utf8(prompt string) ?ustring {
   }
 
   print(r.prompt)
-  r.current = os.get_raw_line().ustring()
+  r.current = os.get_line().ustring()
 
   r.previous_lines[0] = ''.ustring()
   r.search_index = 0