Merge pull request #135 from refaktor/newloader

Newloader
refaktor · Feb 19, 2024 · e9fa4a6 · e9fa4a6
2 parents f050e2b + c80d4ca
commit e9fa4a6
Show file tree

Hide file tree

Showing 9 changed files with 367 additions and 481 deletions.
diff --git a/contrib/builtins_contrib.go b/contrib/builtins_contrib.go
@@ -11,7 +11,6 @@ import (
 
 	"github.com/refaktor/rye/contrib/aws"
 	"github.com/refaktor/rye/contrib/bleve"
-	"github.com/refaktor/rye/contrib/ebitengine"
 	"github.com/refaktor/rye/contrib/postmark"
 	"github.com/refaktor/rye/contrib/ryeopenai"
 	"github.com/refaktor/rye/env"
@@ -50,7 +49,6 @@ func RegisterBuiltins(ps *env.ProgramState, builtinNames *map[string]int) {
 	RegisterBuiltins2(bleve.Builtins_bleve, ps, "bleve", builtinNames)
 	RegisterBuiltins2(postmark.Builtins_postmark, ps, "postmark", builtinNames)
 	RegisterBuiltins2(ryeopenai.Builtins_openai, ps, "openai", builtinNames)
-	RegisterBuiltins2(ebitengine.Builtins_ebitengine, ps, "ebitengine", builtinNames)
 }
 
 // var builtinNames map[string]int

diff --git a/contrib/ebitengine/builtins_ebitengine.go b/contrib/ebitengine/builtins_ebitengine.go
diff --git a/contrib/ebitengine/builtins_ebitengine_not.go b/contrib/ebitengine/builtins_ebitengine_not.go
diff --git a/evaldo/builtins.go b/evaldo/builtins.go
@@ -2048,7 +2048,7 @@ var builtins = map[string]*env.Builtin{
 		},
 	},
 
-	"do-in": { // **
+	"do\\in": { // **
 		Argsn: 2,
 		Doc:   "Takes a Context and a Block. It Does a block inside a given Context.",
 		Fn: func(ps *env.ProgramState, arg0 env.Object, arg1 env.Object, arg2 env.Object, arg3 env.Object, arg4 env.Object) env.Object {
@@ -2073,7 +2073,7 @@ var builtins = map[string]*env.Builtin{
 		},
 	},
 
-	"do-in\\try": { // **
+	"do\\in\\try": { // **
 		Argsn: 2,
 		Doc:   "Takes a Context and a Block. It Does a block inside a given Context.",
 		Fn: func(ps *env.ProgramState, arg0 env.Object, arg1 env.Object, arg2 env.Object, arg3 env.Object, arg4 env.Object) env.Object {
@@ -6988,7 +6988,6 @@ func RegisterBuiltins(ps *env.ProgramState) {
 	RegisterBuiltins2(Builtins_sqlite, ps, "sqlite")
 	RegisterBuiltins2(Builtins_validation, ps, "validation")
 	RegisterBuiltins2(Builtins_ps, ps, "ps")
-	RegisterBuiltins2(Builtins_webview, ps, "webview")
 	RegisterBuiltins2(Builtins_json, ps, "json")
 	RegisterBuiltins2(Builtins_stackless, ps, "stackless")
 	RegisterBuiltins2(Builtins_eyr, ps, "eyr")