repos/rhope: string.rhope comparison

comparison string.rhope @ 78:4d5ea487f810

Working String implementation and some basic (but nowhere near exhaustive) tests

author	Mike Pavone <pavone@retrodev.com>
date	Thu, 08 Jul 2010 21:55:47 -0400
parents	a748300a4143
children	27bb051d631c

comparison

equal deleted inserted replaced

-:a748300a4143
+:4d5ea487f810
 	Length(Int32,Naked)
 }
 String@Array[in:out(String)]
 {
-	out <- [[Build[String()]]Buffer <<[in]]Length <<[Count UTF8[in, 0, 0]]
+	[in]First
+	{ len <- Count UTF8[in, ~, 0i32] }
+	{ len <- 0i32 }
+	out <- [[Build[String()]]Buffer <<[in]]Length <<[len]
 }
 Print@String[string:out]
 {
 	//TODO: Sanitize string (remove terminal escapes and replace invalid UTF)
 Flatten@String[string:out]
 {
 	out <- string
 }
-_CPOff to BOff[buff,cur,expected:outcur,outboff]
+_CPOff to BOff[buff,cur,boff,cpoff,expected,used:out]
 {
 	If[expected]
 	{
-		outcur <- cur
+		byte <- [buff]Index[boff]
-		outboff <- 0i32
-	}{
 		err <- If[[byte]>[192u8]] {}
 		{
 			err <- If[[byte]<[128u8]] {}
 			{
-				outcur <- _CPOff to BOff[buff, [cur]+[1i32], [expected]-[1i32]] {}
+				out <- _CPOff to BOff[buff, cur, [boff]+[1i32], cpoff, [expected]-[1i32], [used]+[1i32]]
-				{ outboff <- [~]+[1i32] }
 			}
 		}
 		Val[err]
 		{
-			outcur <- [cur]+[1i32]
+			ncur <- [cur]+[used]
-			outboff <- 1i32
+			If[[ncur]>[cpoff]]
-		}
+			{
+				out <- [boff]-[[cpoff]-[ncur]]
+			}{
+				out <- CPOff to BOff[buff,ncur,boff,cpoff]
+			}
+		}
+	}{
+		out <- CPOff to BOff[buff,[cur]+[1i32],boff,cpoff]
 	}
 }
 CPOff to BOff[buff,cur,boff,cpoff:out]
 {
 	If[[cur]=[cpoff]]
 	{
 		out <- boff
 	}{
-		byte <- [buff]Index[cur]
+		byte <- [buff]Index[boff]
 		If[[byte] < [128u8]]
 		{
-			nboff <- [bof]+[1i32]
+			nboff <- [boff]+[1i32]
 			ncur <- [cur]+[1i32]
 		}{
 			If[[byte]<[192u8]]
 			{
 				//Error: Encoding for 2nd,3rd or 4th byte of sequence
 				//treat as a single character
-				nboff <- [bof]+[1i32]
+				nboff <- [boff]+[1i32]
 				ncur <- [cur]+[1i32]
 			}{
 				If[[byte]<[224u8]]
 				{
 					expect <- 1i32
 						If[[byte]<[245u8]]
 						{
 							expect <- 3i32
 						}{
 							//Error
-							nboff <- [bof]+[1i32]
+							nboff <- [boff]+[1i32]
 							ncur <- [cur]+[1i32]
 						}
 					}
 				}
 				Val[expect]
 				{
-					ncur <- _CPOff to BOff[buff, [cur]+[1i32], expect] {}
+					out <- _CPOff to BOff[buff, cur, [boff]+[1i32], cpoff, expect, 1i32] {}
-					{ nboff <- [1i32]+[~] }
 				}
 			}
 		}
 		out <- CPOff to BOff[buff, ncur, cpoff, nboff]
 	}
 _=String[left,right,index:out]
 {
 	[left]Byte[index]
 	{
-		,out <- If[[~]=[[right]Byte[index]]]
+		rbyte <- [right]Byte[index] {}
+		{
+			Print["Could not fetch byte from right string at offset:"]
+			{ Print[index] }
+			out <- No
+		}
+		,out <- If[[~]=[rbyte]]
 		{
 			out <- _=String[left,right,[index]+[1]]
 		}
 	}{
 		out <- Yes
 Byte Length@String Slice[string:out]
 {
 	out <- [string]ByteLen >>
 }
+Length@String Slice[string:out]
+{
+	out <- [string]Length >>
+}
 =@String Slice[left,right:out]
 {
 	out <- Eq String[left,right]
 }
 	out <- [[string]Source >>]_Flatten[dest, [[string]Offset >>]+[offset], count]
 }
 Flatten@String Slice[string:out]
 {
-	out <- String[ [[string]Source >>]_Flatten[Array[], [string]Offset >>, [string]ByteLen >>] ]
+	out <- [[Build[String()]]Buffer <<[ [[string]Source >>]_Flatten[Array[], [string]Offset >>, [string]ByteLen >>] ]
+		]Length <<[[string]Length >>]
+}
+Print@String Slice[string:out]
+{
+	out <- Print[Flatten[string]]
 }
 Append@String Slice[left,right:out]
 {
 	out <- String Cat[left,right]
+}
+Slice@String Slice[string,slicepoint:left,right]
+{
+	//TODO: Handle invalid slicepoints
+	sliceoffset <- CPOff to BOff[[[string]Source >>]Buffer >>, 0i32, [string]Offset >>, slicepoint]
+	left <- String Slice[[string]Source >>, [string]Offset >>, slicepoint, [sliceoffset]-[[string]Offset >>]]
+	right <- String Slice[[string]Source >>, sliceoffset, [[string]Length >>]-[slicepoint], [[[string]Source >>]Byte Length]-[sliceoffset]]
 }
 Blueprint String Cat
 {
 	Left
 Byte Length@String Cat[string:out]
 {
 	out <- [string]ByteLen >>
 }
+Length@String Cat[string:out]
+{
+	out <- [string]Length >>
+}
 _Flatten@String Cat[string,dest,offset,count:out]
 {
-	[string]Left >>
+	left <- [string]Left >>
-}
+	If[[offset] < [[left]Byte Length]]
+	{
+		lcount <- Min[[left]Byte Length, count]
+		ldest <- [left]_Flatten[dest, offset, lcount]
+		rcount <- [count]-[lcount]
+	}{
+		ldest <- Val[dest]
+		rcount <- count
+	}
+	If[[[offset]+[count]]>[[left]Byte Length]]
+	{
+		right <- [string]Right >>
+		roffset <- Max[0, [offset]-[[left]Byte Length]]
+		out <- [right]_Flatten[ldest, roffset, Min[[right]Byte Length, rcount]]
+	}{
+		out <- Val[ldest]
+	}
+}
+Flatten@String Cat[string:out]
+{
+	out <- [[Build[String()]
+		]Buffer << [
+			[[string]Right >>]_Flatten[
+				[[string]Left >>]_Flatten[Array[], 0i32, [[string]Left >>]Byte Length],
+				0i32, [[string]Right >>]Byte Length]]
+		]Length << [[string]Length >>]
+}
+Print@String Cat[string:out]
+{
+	out <- Print[Flatten[string]]
+}
+Slice@String Cat[string,slicepoint:left,right]
+{
+	llen <- [[string]Left >>]Length
+	If[[slicepoint]=[llen]]
+	{
+		left <- [string]Left >>
+		right <- [string]Right >>
+	}{
+		If[[slicepoint]<[llen]]
+		{
+			left,lright <- [[string]Left >>]Slice[slicepoint]
+			right <- String Cat[lright,[string]Right >>]
+		}{
+			rleft,right <- [[string]Right >>]Slice[ [slicepoint]-[llen] ]
+			left <- String Cat[[string]Left >>, rleft]
+		}
+	}
+}
+=@String Cat[left,right:out]
+{
+	out <- Eq String[left,right]
+}
+=Delim[string,delims,index:outindex,after,nomatch]
+{
+	delim <- [delims]Index[index]
+	If[[[string]Length]<[[delim]Length]]
+	{
+		try next <- Yes
+	}{
+		check,mafter <- [string]Slice[[delim]Length]
+		,try next <- If[[check]=[delim]]
+		{
+			outindex <- index
+			after <- Val[mafter]
+		}
+	}
+	Val[try next]
+	{
+		,nomatch <- [delims]Next[index]
+		{
+			outindex,after,nomatch <- =Delim[string,delims,~]
+		}
+	}
+}
+_Partition[string,delims:matched,after,not found]
+{
+	not found <- If[[string]=[""]] {}
+	{
+		,after <- =Delim[string, delims, [delims]First]
+		{
+			matched <- [delims]Index[~]
+		} {} {
+			[string]Slice[1] {}
+			{ matched,after,not found <- _Partition[~,delims] }
+		}
+	}
+}
+Partition[string,odelims:before,matched,after,not found]
+{
+	dt <- Blueprint Of[odelims]
+	If[ [[[dt]=[String()]] Or [[dt]=[String Slice()]]] Or [[dt]=[String Cat()]] ]
+	{
+		delims <- [List[]]Append[odelims]
+	}{
+		delims <- Val[odelims]
+	}
+	matched,after,not found <- _Partition[string,delims]
+	{ dlen <- Length[~] }
+	{ alen <- Length[~] }
+	before <- [string]Slice[ [[string]Length]-[[dlen]+[alen]] ]
+}

Mercurial > repos > rhope

comparison string.rhope @ 78:4d5ea487f810