diff --git a/bootstrap/pkg/core/core.go b/bootstrap/pkg/core/core.go
index da740fa..bf16e83 100644
--- a/bootstrap/pkg/core/core.go
+++ b/bootstrap/pkg/core/core.go
@@ -23,13 +23,11 @@ import (
"fmt"
"github.com/chzyer/readline"
- "serene-lang.org/bootstrap/pkg/printer"
- "serene-lang.org/bootstrap/pkg/reader"
"serene-lang.org/bootstrap/pkg/runtime"
)
func rep(rt *runtime.Runtime, line string) {
- ast, err := reader.ReadString(line)
+ ast, err := ReadString(line)
if err != nil {
fmt.Println(err)
@@ -37,8 +35,8 @@ func rep(rt *runtime.Runtime, line string) {
if rt.IsDebugMode() {
fmt.Println("\n### DEBUG ###")
- printer.Print(rt, ast)
- fmt.Println("#############\n")
+ Print(rt, ast)
+ fmt.Print("#############\n\n")
}
result, err := Eval(rt, ast)
@@ -47,7 +45,7 @@ func rep(rt *runtime.Runtime, line string) {
return
}
- printer.Print(rt, result)
+ Print(rt, result)
}
/** TODO:
diff --git a/bootstrap/pkg/printer/printer.go b/bootstrap/pkg/core/printer.go
similarity index 90%
rename from bootstrap/pkg/printer/printer.go
rename to bootstrap/pkg/core/printer.go
index 46a2a46..73f5519 100644
--- a/bootstrap/pkg/printer/printer.go
+++ b/bootstrap/pkg/core/printer.go
@@ -16,8 +16,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-// Package printer contains helper functions to printout AST and exprs
-package printer
+package core
import (
"fmt"
diff --git a/bootstrap/pkg/reader/reader.go b/bootstrap/pkg/core/reader.go
similarity index 88%
rename from bootstrap/pkg/reader/reader.go
rename to bootstrap/pkg/core/reader.go
index 1ebc174..6de3e46 100644
--- a/bootstrap/pkg/reader/reader.go
+++ b/bootstrap/pkg/core/reader.go
@@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-// Package reader provides a set of functions to read forms from several
-// different mediums
-package reader
+package core
import (
"serene-lang.org/bootstrap/pkg/parser"