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

update for support of modern JDKs #113

Closed
fabrice-ducos wants to merge 26 commits from fabrice-ducos/master into master
pull from: fabrice-ducos/master
merge into: open-autonomous-connection:master
Conversation 2 Commits 26 Files Changed 16 +4 -3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2207f7f2e2 - Show all commits

7
src/core/org/luaj/vm2/compiler/FuncState.java
View File

@@ -21,7 +21,8 @@
******************************************************************************/
package org.luaj.vm2.compiler;
import java.util.Hashtable;
import java.util.Map;
import java.util.HashMap;
import org.luaj.vm2.LocVars;
import org.luaj.vm2.Lua;
@@ -47,7 +48,7 @@ public class FuncState extends Constants {
};
Prototype f; /* current function header */
Hashtable h; /* table to find (and reuse) elements in `k' */
Map<LuaValue, Integer> h; /* table to find (and reuse) elements in `k' */
FuncState prev; /* enclosing function */
LexState ls; /* lexical state */
BlockCnt bl; /* chain of current blocks */
@@ -474,7 +475,7 @@ public class FuncState extends Constants {
}
int addk(LuaValue v) {
if (this.h == null) {
this.h = new Hashtable();
this.h = new HashMap<>();
} else if (this.h.containsKey(v)) {
return ((Integer) h.get(v)).intValue();
}