Stop passing globals around everywhere

SquidDev · SquidDev · commit fb18dcb2c1fc · 2025-04-21T14:32:08.000+01:00
And fix tests. I ran the mcfly tests, but nothing else D:.
diff --git a/src/main/java/org/squiddev/cobalt/function/LibFunction.java b/src/main/java/org/squiddev/cobalt/function/LibFunction.java
@@ -259,8 +259,8 @@ public String debugName() {
 	 */
 	protected abstract Varargs invoke(LuaState state, Varargs args) throws LuaError, UnwindThrowable;
 
-	public static void setGlobalLibrary(LuaState state, LuaTable env, String name, LuaValue library) throws LuaError {
-		env.rawset(name, library);
+	public static void setGlobalLibrary(LuaState state, String name, LuaValue library) throws LuaError {
+		state.globals().rawset(name, library);
 		state.registry().getSubTable(Constants.LOADED).rawset(name, library);
 	}
 
diff --git a/src/main/java/org/squiddev/cobalt/lib/BaseLib.java b/src/main/java/org/squiddev/cobalt/lib/BaseLib.java
@@ -59,7 +59,8 @@ public final class BaseLib {
 	private BaseLib() {
 	}
 
-	public static void add(LuaTable env) {
+	public static void add(LuaState state) {
+		var env = state.globals();
 		var self = new BaseLib();
 		env.rawset("_G", env);
 		env.rawset("_VERSION", valueOf("Lua 5.2"));
diff --git a/src/main/java/org/squiddev/cobalt/lib/Bit32Lib.java b/src/main/java/org/squiddev/cobalt/lib/Bit32Lib.java
@@ -38,8 +38,8 @@ public final class Bit32Lib {
 	private Bit32Lib() {
 	}
 
-	public static void add(LuaState state, LuaTable env) throws LuaError {
-		LibFunction.setGlobalLibrary(state, env, "bit32", RegisteredFunction.bind(new RegisteredFunction[]{
+	public static void add(LuaState state) throws LuaError {
+		LibFunction.setGlobalLibrary(state, "bit32", RegisteredFunction.bind(new RegisteredFunction[]{
 			RegisteredFunction.ofV("band", Bit32Lib::band),
 			RegisteredFunction.of("bnot", Bit32Lib::bnot),
 			RegisteredFunction.ofV("bor", Bit32Lib::bor),
diff --git a/src/main/java/org/squiddev/cobalt/lib/CoreLibraries.java b/src/main/java/org/squiddev/cobalt/lib/CoreLibraries.java
@@ -26,7 +26,6 @@
 
 import org.squiddev.cobalt.LuaError;
 import org.squiddev.cobalt.LuaState;
-import org.squiddev.cobalt.LuaTable;
 
 /**
  * Set up an environment with all core/safe globals installed.
@@ -39,33 +38,28 @@ private CoreLibraries() {
 	 * Create a standard set of globals and setup a thread
 	 *
 	 * @param state The current lua state
-	 * @return Table of globals initialized with the standard JSE libraries
 	 * @see #debugGlobals(LuaState)
 	 * @see CoreLibraries
 	 */
-	public static LuaTable standardGlobals(LuaState state) throws LuaError {
-		LuaTable globals = state.globals();
-		BaseLib.add(globals);
-		TableLib.add(state, globals);
-		StringLib.add(state, globals);
-		CoroutineLib.add(state, globals);
-		MathLib.add(state, globals);
-		Utf8Lib.add(state, globals);
-		return globals;
+	public static void standardGlobals(LuaState state) throws LuaError {
+		BaseLib.add(state);
+		TableLib.add(state);
+		StringLib.add(state);
+		CoroutineLib.add(state);
+		MathLib.add(state);
+		Utf8Lib.add(state);
 	}
 
 	/**
 	 * Create standard globals including the {@link DebugLib} library.
 	 *
 	 * @param state The current lua state
-	 * @return Table of globals initialized with the standard JSE and debug libraries
 	 * @see #standardGlobals(LuaState)
 	 * @see CoreLibraries
 	 * @see DebugLib
 	 */
-	public static LuaTable debugGlobals(LuaState state) throws LuaError {
-		LuaTable _G = standardGlobals(state);
-		DebugLib.add(state, _G);
-		return _G;
+	public static void debugGlobals(LuaState state) throws LuaError {
+		standardGlobals(state);
+		DebugLib.add(state);
 	}
 }
diff --git a/src/main/java/org/squiddev/cobalt/lib/CoroutineLib.java b/src/main/java/org/squiddev/cobalt/lib/CoroutineLib.java
@@ -55,8 +55,8 @@ public final class CoroutineLib {
 	private CoroutineLib() {
 	}
 
-	public static void add(LuaState state, LuaTable env) throws LuaError {
-		LibFunction.setGlobalLibrary(state, env, "coroutine", RegisteredFunction.bind(new RegisteredFunction[]{
+	public static void add(LuaState state) throws LuaError {
+		LibFunction.setGlobalLibrary(state, "coroutine", RegisteredFunction.bind(new RegisteredFunction[]{
 			RegisteredFunction.of("create", CoroutineLib::create),
 			RegisteredFunction.ofV("running", CoroutineLib::running),
 			RegisteredFunction.of("status", CoroutineLib::status),
diff --git a/src/main/java/org/squiddev/cobalt/lib/DebugLib.java b/src/main/java/org/squiddev/cobalt/lib/DebugLib.java
@@ -74,8 +74,8 @@ public final class DebugLib {
 	private DebugLib() {
 	}
 
-	public static void add(LuaState state, LuaTable env) throws LuaError {
-		LibFunction.setGlobalLibrary(state, env, "debug", RegisteredFunction.bind(new RegisteredFunction[]{
+	public static void add(LuaState state) throws LuaError {
+		LibFunction.setGlobalLibrary(state, "debug", RegisteredFunction.bind(new RegisteredFunction[]{
 			RegisteredFunction.ofV("debug", DebugLib::debug),
 			RegisteredFunction.ofV("getfenv", DebugLib::getfenv),
 			RegisteredFunction.ofV("gethook", DebugLib::gethook),
diff --git a/src/main/java/org/squiddev/cobalt/lib/MathLib.java b/src/main/java/org/squiddev/cobalt/lib/MathLib.java
@@ -50,7 +50,7 @@ public final class MathLib {
 	private MathLib() {
 	}
 
-	public static void add(LuaState state, LuaTable env) throws LuaError {
+	public static void add(LuaState state) throws LuaError {
 		var self = new MathLib();
 		final RegisteredFunction[] functions = new RegisteredFunction[]{
 			RegisteredFunction.of("abs", (s, arg) -> valueOf(Math.abs(arg.checkDouble()))),
@@ -90,7 +90,7 @@ public static void add(LuaState state, LuaTable env) throws LuaError {
 		t.rawset("huge", LuaDouble.POSINF);
 		t.rawset("mod", t.rawget("fmod"));
 
-		LibFunction.setGlobalLibrary(state, env, "math", t);
+		LibFunction.setGlobalLibrary(state, "math", t);
 	}
 
 	private static LuaValue fmod(LuaState state, LuaValue arg1, LuaValue arg2) throws LuaError {
diff --git a/src/main/java/org/squiddev/cobalt/lib/StringLib.java b/src/main/java/org/squiddev/cobalt/lib/StringLib.java
@@ -53,7 +53,7 @@ public final class StringLib {
 	private StringLib() {
 	}
 
-	public static void add(LuaState state, LuaTable env) throws LuaError {
+	public static void add(LuaState state) throws LuaError {
 		LuaTable t = RegisteredFunction.bind(new RegisteredFunction[]{
 			RegisteredFunction.of("len", StringLib::len),
 			RegisteredFunction.of("lower", StringLib::lower),
@@ -76,7 +76,7 @@ public static void add(LuaState state, LuaTable env) throws LuaError {
 
 		t.rawset("gfind", t.rawget("gmatch"));
 
-		LibFunction.setGlobalLibrary(state, env, "string", t);
+		LibFunction.setGlobalLibrary(state, "string", t);
 		state.stringMetatable = tableOf(INDEX, t);
 	}
 
diff --git a/src/main/java/org/squiddev/cobalt/lib/TableLib.java b/src/main/java/org/squiddev/cobalt/lib/TableLib.java
@@ -58,7 +58,7 @@ public final class TableLib {
 	private TableLib() {
 	}
 
-	public static void add(LuaState state, LuaTable env) throws LuaError {
+	public static void add(LuaState state) throws LuaError {
 		LuaTable t = RegisteredFunction.bind(new RegisteredFunction[]{
 			RegisteredFunction.of("getn", TableLib::getn),
 			RegisteredFunction.of("maxn", TableLib::maxn),
@@ -73,9 +73,9 @@ public static void add(LuaState state, LuaTable env) throws LuaError {
 			RegisteredFunction.ofS("unpack", TableLib::unpack),
 		});
 
-		env.rawset("unpack", t.rawget("unpack"));
+		state.globals().rawset("unpack", t.rawget("unpack"));
 
-		LibFunction.setGlobalLibrary(state, env, "table", t);
+		LibFunction.setGlobalLibrary(state, "table", t);
 	}
 
 	private static LuaValue checkTableLike(LuaState state, Varargs args, int index, int flags) throws LuaError {
diff --git a/src/main/java/org/squiddev/cobalt/lib/Utf8Lib.java b/src/main/java/org/squiddev/cobalt/lib/Utf8Lib.java
@@ -29,7 +29,7 @@ public final class Utf8Lib {
 	private Utf8Lib() {
 	}
 
-	public static void add(LuaState state, LuaTable env) throws LuaError {
+	public static void add(LuaState state) throws LuaError {
 		var self = new Utf8Lib();
 		self.codesIter = RegisteredFunction.ofV("utf8.codesIter", Utf8Lib::codesIter).create();
 
@@ -43,7 +43,7 @@ public static void add(LuaState state, LuaTable env) throws LuaError {
 		});
 		t.rawset("charpattern", PATTERN);
 
-		LibFunction.setGlobalLibrary(state, env, "utf8", t);
+		LibFunction.setGlobalLibrary(state, "utf8", t);
 	}
 
 	public static int buildCharacter(byte[] buffer, long codepoint) {
diff --git a/src/main/java/org/squiddev/cobalt/lib/system/SystemBaseLib.java b/src/main/java/org/squiddev/cobalt/lib/system/SystemBaseLib.java
@@ -31,8 +31,8 @@ public SystemBaseLib(ResourceLoader resources, InputStream in, PrintStream out)
 		this.out = out;
 	}
 
-	public void add(LuaTable env) {
-		RegisteredFunction.bind(env, new RegisteredFunction[]{
+	public void add(LuaState state) {
+		RegisteredFunction.bind(state.globals(), new RegisteredFunction[]{
 			RegisteredFunction.of("collectgarbage", SystemBaseLib::collectgarbage),
 			RegisteredFunction.ofV("loadfile", this::loadfile),
 			RegisteredFunction.ofS("dofile", this::dofile),
diff --git a/src/test/java/org/squiddev/cobalt/AssertTests.java b/src/test/java/org/squiddev/cobalt/AssertTests.java
@@ -117,8 +117,8 @@ public void lua51(String name) throws Exception {
 	public void lua53(String name) throws Exception {
 		ScriptHelper helpers = new ScriptHelper("/assert/lua5.3/");
 		helpers.setup(x -> x.bytecodeFormat(LuaBytecodeFormat.instance()));
-		Bit32Lib.add(helpers.state, helpers.globals);
-		Utf8Lib.add(helpers.state, helpers.globals);
+		Bit32Lib.add(helpers.state);
+		Utf8Lib.add(helpers.state);
 
 		helpers.runWithDump(name);
 	}
diff --git a/src/test/java/org/squiddev/cobalt/LuaSpecTest.java b/src/test/java/org/squiddev/cobalt/LuaSpecTest.java
@@ -43,8 +43,8 @@ public LuaSpecTest() throws IOException, LuaError, CompileException {
 		state = LuaState.builder().errorReporter((error, message) -> LOGGER.log(Level.WARNING, message.get(), error)).build();
 		env = state.globals();
 		CoreLibraries.debugGlobals(state);
-		new SystemBaseLib(x -> null, System.in, System.out).add(env);
-		Bit32Lib.add(state, env);
+		new SystemBaseLib(x -> null, System.in, System.out).add(state);
+		Bit32Lib.add(state);
 		TestLib.add(env);
 
 		// Set the "arg" global as we've have some tests which need it.
diff --git a/src/test/java/org/squiddev/cobalt/ScriptHelper.java b/src/test/java/org/squiddev/cobalt/ScriptHelper.java
@@ -73,7 +73,8 @@ public void setupQuiet() throws LuaError {
 
 	private void setupCommon(LuaState state) throws LuaError {
 		this.state = state;
-		globals = SystemLibraries.debugGlobals(state, this::load, new VoidInputStream(), stdoutStream);
+		globals = state.globals();
+		SystemLibraries.debugGlobals(state, this::load, new VoidInputStream(), stdoutStream);
 		globals.rawset("id_", LibFunction.createV((state$, args) -> args));
 		TimeZone.setDefault(TimeZone.getTimeZone(ZoneOffset.UTC));
 	}
diff --git a/src/test/java/org/squiddev/cobalt/compiler/SimpleTests.java b/src/test/java/org/squiddev/cobalt/compiler/SimpleTests.java
@@ -39,18 +39,17 @@
 
 public class SimpleTests {
 	private LuaState state;
-	private LuaTable _G;
 
 	@BeforeEach
 	public void setup() throws LuaError {
 		state = new LuaState();
-		_G = SystemLibraries.standardGlobals(state);
+		SystemLibraries.standardGlobals(state);
 	}
 
 	private void doTest(String script) {
 		try {
 			InputStream is = new ByteArrayInputStream(script.getBytes(StandardCharsets.UTF_8));
-			LuaFunction c = LoadState.load(state, is, valueOf("script"), _G);
+			LuaFunction c = LoadState.load(state, is, valueOf("script"), state.globals());
 			LuaThread.runMain(state, c);
 		} catch (Exception e) {
 			fail("i/o exception: " + e);
@@ -127,7 +126,7 @@ public void testZap() {
 		String s = "print('\\z";
 		assertThrows(CompileException.class, () -> {
 			InputStream is = new ByteArrayInputStream(s.getBytes(StandardCharsets.UTF_8));
-			LoadState.load(state, is, valueOf("script"), _G);
+			LoadState.load(state, is, valueOf("script"), state.globals());
 		});
 	}
 
diff --git a/src/test/java/org/squiddev/cobalt/lib/system/IoLib.java b/src/test/java/org/squiddev/cobalt/lib/system/IoLib.java
@@ -209,7 +209,7 @@ public IoLib(InputStream stdin, PrintStream stdout) {
 		this.stdout = stdout;
 	}
 
-	public void add(LuaState state, LuaTable env) throws LuaError {
+	public void add(LuaState state) throws LuaError {
 		// io lib functions
 		LuaTable t = RegisteredFunction.bind(new RegisteredFunction[]{
 			RegisteredFunction.ofV("close", this::close),
@@ -246,7 +246,7 @@ public void add(LuaState state, LuaTable env) throws LuaError {
 		});
 		fileMethods.rawset("__index", fileMethods);
 
-		LibFunction.setGlobalLibrary(state, env, "io", t);
+		LibFunction.setGlobalLibrary(state, "io", t);
 	}
 
 	private LuaFile getCurrentInput() throws LuaError {
diff --git a/src/test/java/org/squiddev/cobalt/lib/system/OsLib.java b/src/test/java/org/squiddev/cobalt/lib/system/OsLib.java
@@ -61,7 +61,7 @@ public class OsLib {
 
 	private final long startTime = System.nanoTime();
 
-	public void add(LuaState state, LuaTable env) throws LuaError {
+	public void add(LuaState state) throws LuaError {
 		LuaTable t = RegisteredFunction.bind(new RegisteredFunction[]{
 			RegisteredFunction.of("clock", this::clock),
 			RegisteredFunction.of("date", OsLib::date),
@@ -76,7 +76,7 @@ public void add(LuaState state, LuaTable env) throws LuaError {
 			RegisteredFunction.ofV("tmpname", OsLib::tmpname),
 		});
 
-		LibFunction.setGlobalLibrary(state, env, "os", t);
+		LibFunction.setGlobalLibrary(state, "os", t);
 	}
 
 	private LuaValue clock(LuaState state) {
diff --git a/src/test/java/org/squiddev/cobalt/lib/system/PackageLib.java b/src/test/java/org/squiddev/cobalt/lib/system/PackageLib.java
@@ -70,11 +70,11 @@ public PackageLib(ResourceLoader loader) {
 		this.loader = loader;
 	}
 
-	public void add(LuaState state, LuaTable env) throws LuaError {
-		env.rawset("require", RegisteredFunction.ofV("require", (s, a) -> noYield(() -> require(s, a))).create());
-		env.rawset("module", RegisteredFunction.ofV("module", (s, a) -> noYield(() -> module(s, a))).create());
+	public void add(LuaState state) throws LuaError {
+		state.globals().rawset("require", RegisteredFunction.ofV("require", (s, a) -> noYield(() -> require(s, a))).create());
+		state.globals().rawset("module", RegisteredFunction.ofV("module", (s, a) -> noYield(() -> module(s, a))).create());
 
-		LibFunction.setGlobalLibrary(state, env, "package", packageTbl = tableOf(
+		LibFunction.setGlobalLibrary(state, "package", packageTbl = tableOf(
 			_LOADED, loaded(state),
 			_PRELOAD, state.registry().getSubTable(REGISTRY_PRELOAD),
 			_PATH, _PATH_DEFAULT,
diff --git a/src/test/java/org/squiddev/cobalt/lib/system/SystemLibraries.java b/src/test/java/org/squiddev/cobalt/lib/system/SystemLibraries.java
@@ -2,7 +2,6 @@
 
 import org.squiddev.cobalt.LuaError;
 import org.squiddev.cobalt.LuaState;
-import org.squiddev.cobalt.LuaTable;
 import org.squiddev.cobalt.lib.CoreLibraries;
 import org.squiddev.cobalt.lib.DebugLib;
 
@@ -17,47 +16,41 @@ private SystemLibraries() {
 	 * Create a standard set of globals.
 	 *
 	 * @param state The current lua state
-	 * @return Table of globals initialized with the standard JSE libraries
 	 */
-	public static LuaTable standardGlobals(LuaState state) throws LuaError {
-		return standardGlobals(state, ResourceLoader.FILES, System.in, System.out);
+	public static void standardGlobals(LuaState state) throws LuaError {
+		standardGlobals(state, ResourceLoader.FILES, System.in, System.out);
 	}
 
 	/**
 	 * Create a standard set of globals.
 	 *
 	 * @param state The current lua state
-	 * @return Table of globals initialized with the standard JSE libraries
 	 */
-	public static LuaTable standardGlobals(LuaState state, ResourceLoader resources, InputStream stdin, PrintStream stdout) throws LuaError {
-		LuaTable globals = CoreLibraries.standardGlobals(state);
-		new SystemBaseLib(resources, stdin, stdout).add(globals);
-		new PackageLib(resources).add(state, globals);
-		new IoLib(stdin, stdout).add(state, globals);
-		new OsLib().add(state, globals);
-		return globals;
+	public static void standardGlobals(LuaState state, ResourceLoader resources, InputStream stdin, PrintStream stdout) throws LuaError {
+		CoreLibraries.standardGlobals(state);
+		new SystemBaseLib(resources, stdin, stdout).add(state);
+		new PackageLib(resources).add(state);
+		new IoLib(stdin, stdout).add(state);
+		new OsLib().add(state);
 	}
 
 	/**
 	 * Create a standard set of globals.
 	 *
 	 * @param state The current lua state
-	 * @return Table of globals initialized with the standard JSE libraries
 	 */
-	public static LuaTable debugGlobals(LuaState state) throws LuaError {
-		return debugGlobals(state, ResourceLoader.FILES, System.in, System.out);
+	public static void debugGlobals(LuaState state) throws LuaError {
+		debugGlobals(state, ResourceLoader.FILES, System.in, System.out);
 	}
 
 	/**
 	 * Create standard globals including the {@link DebugLib} library.
 	 *
 	 * @param state The current lua state
-	 * @return Table of globals initialized with the standard JSE and debug libraries
 	 * @see DebugLib
 	 */
-	public static LuaTable debugGlobals(LuaState state, ResourceLoader loader, InputStream stdin, PrintStream stdout) throws LuaError {
-		LuaTable globals = standardGlobals(state, loader, stdin, stdout);
-		DebugLib.add(state, globals);
-		return globals;
+	public static void debugGlobals(LuaState state, ResourceLoader loader, InputStream stdin, PrintStream stdout) throws LuaError {
+		standardGlobals(state, loader, stdin, stdout);
+		DebugLib.add(state);
 	}
 }
diff --git a/src/test/java/org/squiddev/cobalt/vm/UnaryBinaryOperatorsTest.java b/src/test/java/org/squiddev/cobalt/vm/UnaryBinaryOperatorsTest.java
diff --git a/src/test/resources/assert/lua5.1/events.lua b/src/test/resources/assert/lua5.1/events.lua
diff --git a/src/test/resources/compare/metatags.lua b/src/test/resources/compare/metatags.lua
diff --git a/src/test/resources/compare/metatags.out b/src/test/resources/compare/metatags.out

Original file line number	Diff line number	Diff line change
`@@ -259,8 +259,8 @@ public String debugName() {`
`259`	`259`	`*/`
`260`	`260`	`protected abstract Varargs invoke(LuaState state, Varargs args) throws LuaError, UnwindThrowable;`
`261`	`261`
`262`		`- public static void setGlobalLibrary(LuaState state, LuaTable env, String name, LuaValue library) throws LuaError {`
`263`		`- env.rawset(name, library);`
	`262`	`+ public static void setGlobalLibrary(LuaState state, String name, LuaValue library) throws LuaError {`
	`263`	`+ state.globals().rawset(name, library);`
`264`	`264`	`state.registry().getSubTable(Constants.LOADED).rawset(name, library);`
`265`	`265`	`}`
`266`	`266`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,8 @@ public final class BaseLib {`
`59`	`59`	`private BaseLib() {`
`60`	`60`	`}`
`61`	`61`
`62`		`- public static void add(LuaTable env) {`
	`62`	`+ public static void add(LuaState state) {`
	`63`	`+ var env = state.globals();`
`63`	`64`	`var self = new BaseLib();`
`64`	`65`	`env.rawset("_G", env);`
`65`	`66`	`env.rawset("_VERSION", valueOf("Lua 5.2"));`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public final class MathLib {`
`50`	`50`	`private MathLib() {`
`51`	`51`	`}`
`52`	`52`
`53`		`- public static void add(LuaState state, LuaTable env) throws LuaError {`
	`53`	`+ public static void add(LuaState state) throws LuaError {`
`54`	`54`	`var self = new MathLib();`
`55`	`55`	`final RegisteredFunction[] functions = new RegisteredFunction[]{`
`56`	`56`	`RegisteredFunction.of("abs", (s, arg) -> valueOf(Math.abs(arg.checkDouble()))),`
`@@ -90,7 +90,7 @@ public static void add(LuaState state, LuaTable env) throws LuaError {`
`90`	`90`	`t.rawset("huge", LuaDouble.POSINF);`
`91`	`91`	`t.rawset("mod", t.rawget("fmod"));`
`92`	`92`
`93`		`- LibFunction.setGlobalLibrary(state, env, "math", t);`
	`93`	`+ LibFunction.setGlobalLibrary(state, "math", t);`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`private static LuaValue fmod(LuaState state, LuaValue arg1, LuaValue arg2) throws LuaError {`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public final class StringLib {`
`53`	`53`	`private StringLib() {`
`54`	`54`	`}`
`55`	`55`
`56`		`- public static void add(LuaState state, LuaTable env) throws LuaError {`
	`56`	`+ public static void add(LuaState state) throws LuaError {`
`57`	`57`	`LuaTable t = RegisteredFunction.bind(new RegisteredFunction[]{`
`58`	`58`	`RegisteredFunction.of("len", StringLib::len),`
`59`	`59`	`RegisteredFunction.of("lower", StringLib::lower),`
`@@ -76,7 +76,7 @@ public static void add(LuaState state, LuaTable env) throws LuaError {`
`76`	`76`
`77`	`77`	`t.rawset("gfind", t.rawget("gmatch"));`
`78`	`78`
`79`		`- LibFunction.setGlobalLibrary(state, env, "string", t);`
	`79`	`+ LibFunction.setGlobalLibrary(state, "string", t);`
`80`	`80`	`state.stringMetatable = tableOf(INDEX, t);`
`81`	`81`	`}`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public final class Utf8Lib {`
`29`	`29`	`private Utf8Lib() {`
`30`	`30`	`}`
`31`	`31`
`32`		`- public static void add(LuaState state, LuaTable env) throws LuaError {`
	`32`	`+ public static void add(LuaState state) throws LuaError {`
`33`	`33`	`var self = new Utf8Lib();`
`34`	`34`	`self.codesIter = RegisteredFunction.ofV("utf8.codesIter", Utf8Lib::codesIter).create();`
`35`	`35`
`@@ -43,7 +43,7 @@ public static void add(LuaState state, LuaTable env) throws LuaError {`
`43`	`43`	`});`
`44`	`44`	`t.rawset("charpattern", PATTERN);`
`45`	`45`
`46`		`- LibFunction.setGlobalLibrary(state, env, "utf8", t);`
	`46`	`+ LibFunction.setGlobalLibrary(state, "utf8", t);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`public static int buildCharacter(byte[] buffer, long codepoint) {`