diff --git a/src/de/inetsoftware/jwebassembly/binary/BinaryModuleWriter.java b/src/de/inetsoftware/jwebassembly/binary/BinaryModuleWriter.java index 80627ff..3cf201c 100644 --- a/src/de/inetsoftware/jwebassembly/binary/BinaryModuleWriter.java +++ b/src/de/inetsoftware/jwebassembly/binary/BinaryModuleWriter.java @@ -1276,7 +1276,7 @@ public class BinaryModuleWriter extends ModuleWriter implements InstructionOpcod case SET: opCode = ARRAY_SET; break; - case LENGTH: + case LEN: opCode = ARRAY_LEN; break; default: diff --git a/src/de/inetsoftware/jwebassembly/module/JavaMethodWasmCodeBuilder.java b/src/de/inetsoftware/jwebassembly/module/JavaMethodWasmCodeBuilder.java index 498f153..5bafd34 100644 --- a/src/de/inetsoftware/jwebassembly/module/JavaMethodWasmCodeBuilder.java +++ b/src/de/inetsoftware/jwebassembly/module/JavaMethodWasmCodeBuilder.java @@ -643,7 +643,7 @@ class JavaMethodWasmCodeBuilder extends WasmCodeBuilder { addArrayInstruction( ArrayOperator.NEW, type, codePos, lineNumber ); break; case 190: // arraylength - addArrayInstruction( ArrayOperator.LENGTH, ValueType.i32, codePos, lineNumber ); + addArrayInstruction( ArrayOperator.LEN, ValueType.i32, codePos, lineNumber ); break; case 191: // athrow addBlockInstruction( WasmBlockOperator.THROW, null, codePos, lineNumber ); diff --git a/src/de/inetsoftware/jwebassembly/module/WasmArrayInstruction.java b/src/de/inetsoftware/jwebassembly/module/WasmArrayInstruction.java index a0f06cf..5b6fc1a 100644 --- a/src/de/inetsoftware/jwebassembly/module/WasmArrayInstruction.java +++ b/src/de/inetsoftware/jwebassembly/module/WasmArrayInstruction.java @@ -82,7 +82,7 @@ class WasmArrayInstruction extends WasmInstruction { return type instanceof ValueType ? (ValueType)type : ValueType.anyref; case SET: return null; - case LENGTH: + case LEN: return ValueType.i32; default: throw new WasmException( "Unknown array operation: " + op, -1 ); @@ -98,7 +98,7 @@ class WasmArrayInstruction extends WasmInstruction { case NEW: case GET: return 2; - case LENGTH: + case LEN: return 1; case SET: return 3; diff --git a/src/de/inetsoftware/jwebassembly/text/TextModuleWriter.java b/src/de/inetsoftware/jwebassembly/text/TextModuleWriter.java index de5ff64..c352c74 100644 --- a/src/de/inetsoftware/jwebassembly/text/TextModuleWriter.java +++ b/src/de/inetsoftware/jwebassembly/text/TextModuleWriter.java @@ -762,7 +762,7 @@ public class TextModuleWriter extends ModuleWriter { case SET: operation = "set"; break; - case LENGTH: + case LEN: operation = "len"; break; default: diff --git a/src/de/inetsoftware/jwebassembly/wasm/ArrayOperator.java b/src/de/inetsoftware/jwebassembly/wasm/ArrayOperator.java index 7766125..39718d5 100644 --- a/src/de/inetsoftware/jwebassembly/wasm/ArrayOperator.java +++ b/src/de/inetsoftware/jwebassembly/wasm/ArrayOperator.java @@ -1,5 +1,5 @@ /* - Copyright 2018 Volker Berlin (i-net software) + Copyright 2018 - 2019 Volker Berlin (i-net software) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -25,5 +25,5 @@ public enum ArrayOperator { NEW, GET, SET, - LENGTH, + LEN, } \ No newline at end of file