Mercurial > repos > rhope

annotate string.rhope @ 69:d0ce696786cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up debug print statements a bit. Fix bug that prevented workers that took no inputs from working. Remove workaround in Array for said bug.
author Mike Pavone <pavone@retrodev.com>
date Wed, 16 Jun 2010 04:36:08 +0000
parents 048046186d22
children c40c3d399133
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
52
079200bc3e75 String literals almost working. Print moved out of C runtime.
Mike Pavone <pavone@retrodev.com>
parents: 51
diff changeset
1
51
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
2 UTF8 Expect[num,arr,index,count,consumed:out]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
3 {
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
4 byte <- [arr]Index[index]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
5 {
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
6 If[[128u8]>[byte]]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
7 {
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
8 //Error: ASCII byte when we were expecting part of a mutlibyte sequence
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
9 //treat each byte as a separate character
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
10 ncount <- [1i32]+[[count]+[consumed]]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
11 }{
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
12 If[[192u8]>[byte]]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
13 {
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
14 If[[num]=[1]]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
15 {
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
16 //Sequence is complete count as single character
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
17 ncount <- [1i32]+[count]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
18 }{
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
19 out <- UTF8 Expect[[num]-[1], arr, [index]+[1], count, [1i32]+[consumed]]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
20 }
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
21 }{
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
22 //Error: too high to be a continuation byte
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
23 ncount <- [1i32]+[[count]+[consumed]]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
24 }
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
25 }
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
26 }{
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
27 //Error: string ended in the middle of a multi-byte sequence
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
28 out <- [count]+[consumed]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
29 }
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
30 Val[ncount]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
31 {
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
32 [arr]Next[index]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
33 {
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
34 out <- Count UTF8[arr, ~, ncount]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
35 }{
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
36 out <- Val[ncount]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
37 }
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
38 }
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
39 }
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
40
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
41 Count UTF8[arr,index,count:out]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
42 {
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
43 byte <- [arr]Index[index]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
44 If[[128u8]>[byte]]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
45 { ncount <- [1i32]+[count] }
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
46 {
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
47 If[[192u8]>[byte]]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
48 {
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
49 //Error: Encoding for 2nd,3rd or 4th byte of sequence
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
50 //treat as a single character
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
51 ncount <- [1i32]+[count]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
52 }{
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
53 If[[224u8]>[byte]]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
54 {
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
55 out <- UTF8 Expect[1, arr, [index]+[1], count, 1]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
56 }{
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
57 If[[240u8]>[byte]]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
58 {
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
59 out <- UTF8 Expect[2, arr, [index]+[1], count, 1]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
60 }{
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
61 If[[245u8]>[byte]]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
62 {
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
63 out <- UTF8 Expect[3, arr, [index]+[1], count, 1]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
64 }{
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
65 //Error: Out of range of Unicode standard
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
66 //treat as a single character
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
67 ncount <- [1i32]+[count]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
68 }
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
69 }
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
70 }
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
71 }
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
72 }
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
73 [arr]Next[index]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
74 {
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
75 out <- Count UTF8[arr, ~, ncount]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
76 }{
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
77 out <- Val[ncount]
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
78 }
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
79 }
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
80
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
81 Blueprint String
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
82 {
55
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
83 Buffer
51
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
84 Length(Int32,Naked)
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
85 }
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
86
55
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
87 String[in(Array):out(String)]
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
88 {
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
89 out <- [[Build[String()]]Buffer <<[in]]Length <<[Count UTF8[in, 0, 0]]
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
90 }
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
91
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
92 Print@String[string:out]
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
93 {
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
94 //TODO: Sanitize string (remove terminal escapes and replace invalid UTF)
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
95 write[1i32, [string]Buffer >>, Int64[[[string]Buffer >>]Length >>]]
69
d0ce696786cc Clean up debug print statements a bit. Fix bug that prevented workers that took no inputs from working. Remove workaround in Array for said bug.
Mike Pavone <pavone@retrodev.com>
parents: 55
diff changeset
96 { out <- write[1i32, [Array[]]Append[10u8], 1i64] }
55
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
97 }
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
98
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
99 Flatten@String[string:out]
51
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
100 {
55
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
101 out <- string
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
102 }
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
103
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
104 Slice@String[string,slicepoint:left,right]
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
105 {
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
106 //TODO: Handle invalid slicepoints
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
107 left <- String Slice[string, 0i32, slicepoint]
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
108 right <- String Slice[string, slicepoint, [[string]Length >>]-[slicepoint]]
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
109 }
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
110
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
111 Blueprint String Slice
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
112 {
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
113 Source
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
114 Offset(Int32,Naked)
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
115 Length(Int32,Naked)
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
116 }
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
117
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
118 String Slice[source,offset,length:out(String Slice)]
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
119 {
048046186d22 Started working on Slice@String
Mike Pavone <pavone@retrodev.com>
parents: 52
diff changeset
120 out <- [[[Build[String Slice()]]Source <<[source]]Offset <<[offset]]Length <<[length]
51
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
121 }
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
122
7d6a6906b648 Added integer type conversions and started on the implementation of String
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
123