From c8df427ccaa5e5a4d22e08e71a006e090d64c34f Mon Sep 17 00:00:00 2001
From: surdeus <surdeus@gmail.com>
Date: Sat, 15 Jun 2024 01:00:26 +0500
Subject: [PATCH] feat: implemented the objects module.

---
 tests/dogs.xgo           | 24 +++++++++++++++++++-----
 tests/import.xgo         |  3 ++-
 xmodules/modules.go      |  6 ++++--
 xmodules/objects/main.go | 27 +++++++++++++++++++++++++++
 xtool/main.go            |  2 +-
 5 files changed, 53 insertions(+), 9 deletions(-)
 create mode 100644 xmodules/objects/main.go

diff --git a/tests/dogs.xgo b/tests/dogs.xgo
index 3105e67..218e84e 100644
--- a/tests/dogs.xgo
+++ b/tests/dogs.xgo
@@ -1,8 +1,22 @@
+objects := import("objects")
+fmt := import("fmt")
+
+new := func(name) {
+	ret := objects.new()
+	ret.name = name
+
+	ret.def("bark", func(self, n){
+		fmt.print(self.name, ": ")
+		for i:=0 ; i<n ; i++ {
+			fmt.print("BARK!")
+		}
+		fmt.println()
+	})
+
+	return ret
+}
+
 
 export {
-	"new": func(name) {
-		return {
-			name: name
-		}
-	}
+	"new": new
 }
diff --git a/tests/import.xgo b/tests/import.xgo
index 3106eee..159c42b 100644
--- a/tests/import.xgo
+++ b/tests/import.xgo
@@ -2,5 +2,6 @@ fmt := import("fmt")
 dogs := import("./tests/dogs")
 
 dog := dogs.new("check")
-fmt.println(dog)
+//fmt.println(dog)
+dog.bark(10)
 
diff --git a/xmodules/modules.go b/xmodules/modules.go
index a8954a1..640379e 100644
--- a/xmodules/modules.go
+++ b/xmodules/modules.go
@@ -6,15 +6,17 @@ import "surdeus.su/core/xgo/xmodules/logx"
 import "surdeus.su/core/xgo/xmodules/paths"
 import "surdeus.su/core/xgo/xmodules/httpx"
 import "surdeus.su/core/xgo/xmodules/htmlx"
+import "surdeus.su/core/xgo/xmodules/objects"
 import "github.com/d5/tengo/v2"
 
 // The main map to import all the implemented modules.
-var Modules = func() *tengo.ModuleMap {
+func GetModules() *tengo.ModuleMap {
 	ret := stdlib.GetModuleMap(stdlib.AllModuleNames()...)
 	ret.AddBuiltinModule("cjson", cjson.Module)
 	ret.AddBuiltinModule("log", logx.Module)
 	ret.AddBuiltinModule("paths", paths.Module)
 	ret.AddBuiltinModule("http", httpx.Module)
 	ret.AddBuiltinModule("html", htmlx.Module)
+	ret.Add("objects", objects.GetModule())
 	return ret
-}()
+}
diff --git a/xmodules/objects/main.go b/xmodules/objects/main.go
new file mode 100644
index 0000000..23140e4
--- /dev/null
+++ b/xmodules/objects/main.go
@@ -0,0 +1,27 @@
+package objects
+
+import "github.com/d5/tengo/v2"
+
+const src = `
+
+new := func() {
+	self := {}
+	self.def = func(name, method){
+		self[name] = func(...args){
+			return method(self, args...)
+		}
+	}
+	return self
+}
+
+export {
+	new: new
+}
+`
+
+func GetModule() tengo.Importable {
+	return &tengo.SourceModule{
+		Src: []byte(src),
+	}
+}
+
diff --git a/xtool/main.go b/xtool/main.go
index 2f97a89..494eb09 100644
--- a/xtool/main.go
+++ b/xtool/main.go
@@ -52,7 +52,7 @@ func Run(flags *mtool.Flags) {
 		return
 	}
 
-	modules := xmodules.Modules
+	modules := xmodules.GetModules()
 	if len(iargs) == 0 {
 		// REPL
 		RunREPL(modules, os.Stdin, os.Stdout)