repos/tabletprog: modules/string.tp comparison

Merge

author	Michael Pavone <pavone@retrodev.com>
date	Fri, 01 Aug 2014 18:56:50 -0700
parents	8dbb2d2522a5
children	74cab9b5f2a4

comparison

equal deleted inserted replaced

-:2308336790d4
+:dfd204c82849
 		}
 		if: start > bytes {
 			start <- bytes
 		}
 		clampedLen <- tocopy num
+		if: clampedLen < 0 {
+			clampedLen <- bytes - clampedLen
+			if: clampedLen < 0 {
+				clampedLen <- 0
+			}
+		}
 		if: start + clampedLen > bytes {
 			clampedLen <- bytes - start
 		}
 		ret <- make_object: (addr_of: string_meta) NULL 0
 		ret data!: (GC_MALLOC_ATOMIC: clampedLen + 1)
 		memcpy: (ret data) data + start clampedLen
 		ret len!: clampedLen
 		ret bytes!: clampedLen
+		(ret data) set: clampedLen 0
 		ret
 	}
 	from <- :start {
 		from: start withLength: length
 				b = space || b = tab || b = nl || b = cr
 			}
 		} do: {
 			start <- start + 1
 		}
-		end <- l
+		end <- l - 1
 		while: {
-			if: end > 0 {
+			if: end > start {
-				b <- byte: end - 1
+				b <- byte: end
 				b = space || b = tab || b = nl || b = cr
 			}
 		} do: {
 			end <- end - 1
 		}
-		from: start withLength: (end - start)
+		from: start withLength: (end + 1 - start)
+	}
+	startsWith? <- :prefix {
+		if: (prefix length) <= length {
+			0 = (compareSub: prefix 0 0 (prefix length))
+		}
 	}
 	endsWith? <- :suffix {
 		if: (suffix length) <= length {
 			0 = (compareSub: suffix (length - (suffix length)) 0 (suffix length))

Mercurial > repos > tabletprog