topchetoeu/j2s
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 74 Wiki Activity

Core library reprogramming #5

Merged
TopchetoEU merged 23 commits from TopchetoEU/corelib-reprogramming into master 2023-10-04 05:50:26 +00:00
Conversation 0 Commits 23 Files Changed 81 +4 -5
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cf36b7adc5 - Show all commits

9
src/me/topchetoeu/jscript/polyfills/StringPolyfill.java
View File

@ -19,7 +19,7 @@ public class StringPolyfill {
private static String passThis(String funcName, Object val) { private static String passThis(String funcName, Object val) {
if (val instanceof StringPolyfill) return ((StringPolyfill)val).value; if (val instanceof StringPolyfill) return ((StringPolyfill)val).value;
else if (val instanceof String) return (String)val; else if (val instanceof String) return (String)val;
else throw EngineException.ofType(String.format("'%s' may be called upon object and primitve strings.", funcName)); else throw EngineException.ofType(String.format("'%s' may only be called upon object and primitve strings.", funcName));
} }
private static int normalizeI(int i, int len, boolean clamp) { private static int normalizeI(int i, int len, boolean clamp) {
if (i < 0) i += len; if (i < 0) i += len;
@ -198,7 +198,7 @@ public class StringPolyfill {
if (parts.length > limit) res = new ArrayValue(limit); if (parts.length > limit) res = new ArrayValue(limit);
else res = new ArrayValue(parts.length); else res = new ArrayValue(parts.length);
for (var i = 0; i < parts.length; i++) res.set(ctx, i, parts[i]); for (var i = 0; i < parts.length && i < limit; i++) res.set(ctx, i, parts[i]);
return res; return res;
} }
@ -235,11 +235,10 @@ public class StringPolyfill {
else return val; else return val;
} }
@Native(thisArg = true) public static String toString(Context ctx, Object thisArg) throws InterruptedException { @Native(thisArg = true) public static String toString(Context ctx, Object thisArg) throws InterruptedException {
return Values.toString(ctx, Values.toNumber(ctx, thisArg)); return passThis("toString", thisArg);
} }
@Native(thisArg = true) public static String valueOf(Context ctx, Object thisArg) throws InterruptedException { @Native(thisArg = true) public static String valueOf(Context ctx, Object thisArg) throws InterruptedException {
if (thisArg instanceof StringPolyfill) return ((StringPolyfill)thisArg).value; return passThis("valueOf", thisArg);
else return Values.toString(ctx, thisArg);
} }
@Native public static String fromCharCode(int ...val) { @Native public static String fromCharCode(int ...val) {