CHANGELOG.md

@@ -1,12 +1,6 @@
 # 🎀 Changelog
 
 ## Unreleased
-### Added
-- Made a few additions to the sink type:
-  - `read()` method for retrieving input (so now the `in` sink of commanders is useful)
-  - `flush()` and `autoFlush()` related to flushing outputs
-  - `pipe` property to check if a sink with input is a pipe (like stdin)
-
 ### Fixed
 - Replaced `sed` in-place editing with `grep` and `mv` for compatibility with BSD utils
 

docs/api/hilbish/_index.md

@@ -109,16 +109,6 @@ A sink is a structure that has input and/or output to/from
 a desination.
 
 ### Methods
-#### autoFlush(auto)
-Sets/toggles the option of automatically flushing output.
-A call with no argument will toggle the value.
-
-#### flush()
-Flush writes all buffered input to the sink.
-
-#### read() -> string
-Reads input from the sink.
-
 #### write(str)
 Writes data to a sink.
 

emmyLuaDocs/hilbish.lua

@@ -180,18 +180,6 @@ function hilbish.jobs:foreground() end
 --- @param cmd string
 function hilbish.runner.lua(cmd) end
 
---- Sets/toggles the option of automatically flushing output.
---- A call with no argument will toggle the value.
---- @param auto boolean|nil
-function hilbish:autoFlush(auto) end
-
---- Flush writes all buffered input to the sink.
-function hilbish:flush() end
-
---- Reads input from the sink.
---- @returns string
-function hilbish:read() end
-
 --- Writes data to a sink.
 function hilbish:write(str) end
 

sink.go

@@ -1,10 +1,8 @@
 package main
 
 import (
-	"bufio"
 	"fmt"
 	"io"
-	"os"
 
 	"hilbish/util"
 
@@ -17,11 +15,9 @@ var sinkMetaKey = rt.StringValue("hshsink")
 // A sink is a structure that has input and/or output to/from
 // a desination.
 type sink struct{
-	writer *bufio.Writer
-	reader *bufio.Reader
-	file *os.File
+	writer io.Writer
+	reader io.Reader
 	ud *rt.UserData
-	autoFlush bool
 }
 
 func setupSinkType(rtm *rt.Runtime) {
@@ -29,35 +25,15 @@ func setupSinkType(rtm *rt.Runtime) {
 
 	sinkMethods := rt.NewTable()
 	sinkFuncs := map[string]util.LuaExport{
-		"flush": {luaSinkFlush, 1, false},
-		"read": {luaSinkRead, 1, false},
-		"autoFlush": {luaSinkAutoFlush, 2, false},
 		"write": {luaSinkWrite, 2, false},
 		"writeln": {luaSinkWriteln, 2, false},
 	}
 	util.SetExports(l, sinkMethods, sinkFuncs)
 
 	sinkIndex := func(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
-		s, _ := sinkArg(c, 0)
-
 		arg := c.Arg(1)
 		val := sinkMethods.Get(arg)
 
-		if val != rt.NilValue {
-			return c.PushingNext1(t.Runtime, val), nil
-		}
-
-		keyStr, _ := arg.TryString()
-
-		switch keyStr {
-			case "pipe":
-				val = rt.BoolValue(false)
-				if s.file != nil {
-					fileInfo, _ := s.file.Stat();
-					val = rt.BoolValue(fileInfo.Mode() & os.ModeCharDevice == 0)
-				}
-		}
-
 		return c.PushingNext1(t.Runtime, val), nil
 	}
 
@@ -65,25 +41,6 @@ func setupSinkType(rtm *rt.Runtime) {
 	l.SetRegistry(sinkMetaKey, rt.TableValue(sinkMeta))
 }
 
-// #member
-// read() -> string
-// --- @returns string
-// Reads input from the sink.
-func luaSinkRead(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
-	if err := c.Check1Arg(); err != nil {
-		return nil, err
-	}
-
-	s, err := sinkArg(c, 0)
-	if err != nil {
-		return nil, err
-	}
-
-	str, _ := s.reader.ReadString('\n')
-
-	return c.PushingNext1(t.Runtime, rt.StringValue(str)), nil
-}
-
 // #member
 // write(str)
 // Writes data to a sink.
@@ -102,9 +59,6 @@ func luaSinkWrite(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 	}
 
 	s.writer.Write([]byte(data))
-	if s.autoFlush {
-		s.writer.Flush()
-	}
 
 	return c.Next(), nil
 }
@@ -127,74 +81,22 @@ func luaSinkWriteln(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 	}
 
 	s.writer.Write([]byte(data + "\n"))
-	if s.autoFlush {
-		s.writer.Flush()
-	}
-
-	return c.Next(), nil
-}
-
-// #member
-// flush()
-// Flush writes all buffered input to the sink.
-func luaSinkFlush(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
-	if err := c.Check1Arg(); err != nil {
-		return nil, err
-	}
-
-	s, err := sinkArg(c, 0)
-	if err != nil {
-		return nil, err
-	}
-
-	s.writer.Flush()
-
-	return c.Next(), nil
-}
-
-// #member
-// autoFlush(auto)
-// Sets/toggles the option of automatically flushing output.
-// A call with no argument will toggle the value.
-// --- @param auto boolean|nil
-func luaSinkAutoFlush(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
-	s, err := sinkArg(c, 0)
-	if err != nil {
-		return nil, err
-	}
-
-	v := c.Arg(1)
-	if v.Type() != rt.BoolType && v.Type() != rt.NilType {
-		return nil, fmt.Errorf("#1 must be a boolean")
-	}
-
-	value := !s.autoFlush
-	if v.Type() == rt.BoolType {
-		value = v.AsBool()
-	}
-
-	s.autoFlush = value
 
 	return c.Next(), nil
 }
 
 func newSinkInput(r io.Reader) *sink {
 	s := &sink{
-		reader: bufio.NewReader(r),
+		reader: r,
 	}
 	s.ud = sinkUserData(s)
 
-	if f, ok := r.(*os.File); ok {
-		s.file = f
-	}
-
 	return s
 }
 
 func newSinkOutput(w io.Writer) *sink {
 	s := &sink{
-		writer: bufio.NewWriter(w),
-		autoFlush: true,
+		writer: w,
 	}
 	s.ud = sinkUserData(s)