open-autonomous-connection/luaj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix compilation, tests

Browse Source
This commit is contained in:
Adrian Siekierka
2022-09-04 02:06:08 +02:00
parent 342d940b5e
commit ac261965a8
3 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
luaj-jse/src/main/java/org/luaj/vm2/lib/jse/JseBaseLib.java
View File

@@ -87,22 +87,10 @@ import org.luaj.vm2.lib.ResourceFinder;
public class JseBaseLib extends org.luaj.vm2.lib.BaseLib {
<<<<<<< HEAD:src/jse/org/luaj/vm2/lib/jse/JseBaseLib.java
/** Perform one-time initialization on the library by creating a table
* containing the library functions, adding that table to the supplied environment,
* adding the table to package.loaded, and returning table as the return value.
* <P>Specifically, extend the library loading to set the default value for {@link Globals#STDIN}
=======
/**
* Perform one-time initialization on the library by creating a table
* containing the library functions, adding that table to the supplied
* environment, adding the table to package.loaded, and returning table as
* the return value.
* <P>
* Specifically, extend the library loading to set the default value for
* {@link Globals#STDIN}
*
>>>>>>> farmboy0/master:luaj-jse/src/main/java/org/luaj/vm2/lib/jse/JseBaseLib.java
* @param modname the module name supplied if this is loaded via 'require'.
* @param env the environment to load into, which must be a Globals
* instance.