fluencelabs/assemblyscript
1
0
Fork 0
mirror of https://github.com/fluencelabs/assemblyscript synced 2025-06-12 14:31:28 +00:00
Code Issues Projects Releases Wiki Activity

Warn on constant locals not being actual constants; Simplify changetype

Browse Source
This commit is contained in:
dcodeIO
2017-12-28 17:16:37 +01:00
parent 2f12c7fa50
commit 4207f6460d
14 changed files with 90 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
std/assembly/string.ts
View File

@ -1,4 +1,4 @@
const EMPTY: String = changetype<string,String>("");
const EMPTY: String = changetype<String>("");
@global()
export class String {
@ -29,10 +29,10 @@ export class String {
assert(this != null);
if (pos < 0 || pos >= this.length)
return -1; // undefined
let first: i32 = <i32>load<u16>(this.ptr + (<usize>pos << 1));
var first = <i32>load<u16>(this.ptr + (<usize>pos << 1));
if (first < 0xD800 || first > 0xDBFF || pos + 1 == this.length)
return first;
let second: i32 = <i32>load<u16>(this.ptr + ((<usize>pos + 1) << 1));
var second = <i32>load<u16>(this.ptr + ((<usize>pos + 1) << 1));
if (second < 0xDC00 || second > 0xDFFF)
return first;
return ((first - 0xD800) << 10) + (second - 0xDC00) + 0x10000;
@ -42,9 +42,9 @@ export class String {
concat(other: String): String {
assert(this != null);
assert(other != null);
const thisLen: isize = this.length;
const otherLen: isize = other.length;
const len: usize = thisLen + otherLen;
var thisLen: isize = this.length;
var otherLen: isize = other.length;
var len: usize = thisLen + otherLen;
return new String(
Heap.copy(
Heap.copy(
@ -62,9 +62,9 @@ export class String {
endsWith(searchString: String, endPosition: i32 = 0x7fffffff): bool {
assert(this != null);
assert(searchString != null);
let end: isize = <isize>min<i32>(max<i32>(endPosition, 0), this.length);
let searchLength: isize = searchString.length;
let start: isize = end - searchLength;
var end: isize = <isize>min<i32>(max<i32>(endPosition, 0), this.length);
var searchLength: isize = searchString.length;
var start: isize = end - searchLength;
if (start < 0)
return false;
return !Heap.compare(this.ptr + (start << 1), searchString.ptr, searchLength << 1);
@ -85,11 +85,11 @@ export class String {
indexOf(searchString: String, position: i32 = 0): i32 {
assert(this != null);
assert(searchString != null);
let pos: isize = position;
let len: isize = this.length;
let start: isize = min<isize>(max<isize>(pos, 0), len);
let searchLen: isize = searchString.length;
for (let k: usize = start; <isize>k + searchLen <= len; ++k)
var pos: isize = position;
var len: isize = this.length;
var start: isize = min<isize>(max<isize>(pos, 0), len);
var searchLen: isize = searchString.length;
for (var k: usize = start; <isize>k + searchLen <= len; ++k)
if (!Heap.compare(this.ptr + (k << 1), searchString.ptr, searchLen << 1))
return <i32>k;
return -1;
@ -98,10 +98,10 @@ export class String {
startsWith(searchString: String, position: i32 = 0): bool {
assert(this != null);
assert(searchString != null);
let pos: isize = position;
let len: isize = this.length;
let start: isize = min<isize>(max<isize>(position, 0), len);
let searchLength: isize = searchString.length;
var pos: isize = position;
var len: isize = this.length;
var start: isize = min<isize>(max<isize>(position, 0), len);
var searchLength: isize = searchString.length;
if (searchLength + start > len)
return false;
return !Heap.compare(this.ptr + (start << 1), searchString.ptr, searchLength << 1);
@ -109,12 +109,12 @@ export class String {
substr(start: i32, length: i32 = i32.MAX_VALUE): String {
assert(this != null);
let intStart: isize = start;
let end: isize = length;
let size: isize = this.length;
var intStart: isize = start;
var end: isize = length;
var size: isize = this.length;
if (intStart < 0)
intStart = max<isize>(size + intStart, 0);
let resultLength: isize = min<isize>(max<isize>(end, 0), size - intStart);
var resultLength: isize = min<isize>(max<isize>(end, 0), size - intStart);
if (resultLength < 0)
return EMPTY;
return new String(this.ptr + (intStart << 1), <i32>resultLength);
@ -122,11 +122,11 @@ export class String {
substring(start: i32, end: i32 = i32.MAX_VALUE): String {
assert(this != null);
let len: i32 = this.length;
let finalStart: i32 = min<i32>(max<i32>(start, 0), len);
let finalEnd: i32 = min<i32>(max<i32>(end, 0), len);
let from: i32 = min<i32>(finalStart, finalEnd);
let to: i32 = max<i32>(finalStart, finalEnd);
var len = this.length;
var finalStart = min<i32>(max<i32>(start, 0), len);
var finalEnd = min<i32>(max<i32>(end, 0), len);
var from = min<i32>(finalStart, finalEnd);
var to = max<i32>(finalStart, finalEnd);
len = to - from;
if (!len)
return EMPTY;
@ -137,10 +137,10 @@ export class String {
trim(): String {
assert(this != null);
let length: usize = this.length;
var length: usize = this.length;
while (length && isWhiteSpaceOrLineTerminator(load<u16>(this.ptr + (length << 1))))
--length;
let start: usize = 0;
var start: usize = 0;
while (start < length && isWhiteSpaceOrLineTerminator(load<u16>(this.ptr + (start << 1)))) {
++start; --length;
}
@ -153,8 +153,8 @@ export class String {
trimLeft(): String {
assert(this != null);
let start: isize = 0;
let len: isize = this.length;
var start: isize = 0;
var len: isize = this.length;
while (start < len && isWhiteSpaceOrLineTerminator(load<u16>(this.ptr + (start << 1))))
++start;
if (!start)
@ -164,7 +164,7 @@ export class String {
trimRight(): String {
assert(this != null);
let len: isize = this.length;
var len: isize = this.length;
while (len > 0 && isWhiteSpaceOrLineTerminator(load<u16>(this.ptr + (len << 1))))
--len;
if (len <= 0)