Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /branches/charisee/src/compiler/low-il/low-il.sml
ViewVC logotype

Diff of /branches/charisee/src/compiler/low-il/low-il.sml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2529, Wed Jan 29 06:58:55 2014 UTC revision 2668, Thu Jun 12 03:29:04 2014 UTC
# Line 38  Line 38 
38        | IMul        | IMul
39        | IDiv        | IDiv
40        | INeg        | INeg
41          | IndexTensor of int * ty * ty * ty
42          | addSca
43          | subSca
44          | prodSca
45          | divSca
46          | addVec of int
47          | subVec of int
48          | prodVec of int
49          | prodScaV of int
50          | sumVec of int
51        | Abs of ty        | Abs of ty
52        | LT of ty        | LT of ty
53        | LTE of ty        | LTE of ty
# Line 48  Line 58 
58        | Not        | Not
59        | Max        | Max
60        | Min        | Min
       | C of int  
       | V of int * int * ty * ty  
       | S of int * ty * ty  
       | addSca  
       | subSca  
       | prodSca  
       | divSca  
       | cons of ty  
       | img of int * ty * int  
       | imgAddr of ty * int  
       | imgLoad of int * int  
       | addVec of int  
       | subVec of int  
       | prodVec of int  
       | prodScaV of int  
       | sumVec of int  
61        | Clamp of ty        | Clamp of ty
62        | Lerp of ty        | Lerp of ty
       | Norm of ty  
       | Normalize of int  
63        | PrincipleEvec of ty        | PrincipleEvec of ty
64        | EigenVecs2x2        | EigenVecs2x2
65        | EigenVecs3x3        | EigenVecs3x3
# Line 81  Line 73 
73        | Append of ty        | Append of ty
74        | Prepend of ty        | Prepend of ty
75        | Concat of ty        | Concat of ty
76        | Length of ty        | Sqrt
77        | Ceiling of int        | Ceiling of int
78        | Floor of int        | Floor of int
79        | Round of int        | Round of int
# Line 96  Line 88 
88        | Inside of ImageInfo.info * int        | Inside of ImageInfo.info * int
89        | LoadSeq of ty * string        | LoadSeq of ty * string
90        | LoadImage of ImageInfo.info        | LoadImage of ImageInfo.info
91          | imgAddr of ImageInfo.info * ty * int
92          | imgLoad of ImageInfo.info * int * int
93        | Input of ty * string * string        | Input of ty * string * string
94        | InputWithDefault of ty * string * string        | InputWithDefault of ty * string * string
95        | Print of tys        | Print of tys
# Line 105  Line 99 
99        | resultArity IMul = 1        | resultArity IMul = 1
100        | resultArity IDiv = 1        | resultArity IDiv = 1
101        | resultArity INeg = 1        | resultArity INeg = 1
102          | resultArity (IndexTensor _) = 1
103          | resultArity addSca = 1
104          | resultArity subSca = 1
105          | resultArity prodSca = 1
106          | resultArity divSca = 1
107          | resultArity (addVec _) = 1
108          | resultArity (subVec _) = 1
109          | resultArity (prodVec _) = 1
110          | resultArity (prodScaV _) = 1
111          | resultArity (sumVec _) = 1
112        | resultArity (Abs _) = 1        | resultArity (Abs _) = 1
113        | resultArity (LT _) = 1        | resultArity (LT _) = 1
114        | resultArity (LTE _) = 1        | resultArity (LTE _) = 1
# Line 115  Line 119 
119        | resultArity Not = 1        | resultArity Not = 1
120        | resultArity Max = 1        | resultArity Max = 1
121        | resultArity Min = 1        | resultArity Min = 1
       | resultArity (C _) = 1  
       | resultArity (V _) = 1  
       | resultArity (S _) = 1  
       | resultArity addSca = 1  
       | resultArity subSca = 1  
       | resultArity prodSca = 1  
       | resultArity divSca = 1  
       | resultArity (cons _) = 1  
       | resultArity (img _) = 1  
       | resultArity (imgAddr _) = 1  
       | resultArity (imgLoad _) = 1  
       | resultArity (addVec _) = 1  
       | resultArity (subVec _) = 1  
       | resultArity (prodVec _) = 1  
       | resultArity (prodScaV _) = 1  
       | resultArity (sumVec _) = 1  
122        | resultArity (Clamp _) = 1        | resultArity (Clamp _) = 1
123        | resultArity (Lerp _) = 1        | resultArity (Lerp _) = 1
       | resultArity (Norm _) = 1  
       | resultArity (Normalize _) = 1  
124        | resultArity (PrincipleEvec _) = 1        | resultArity (PrincipleEvec _) = 1
125        | resultArity EigenVecs2x2 = 1        | resultArity EigenVecs2x2 = 1
126        | resultArity EigenVecs3x3 = 1        | resultArity EigenVecs3x3 = 1
# Line 148  Line 134 
134        | resultArity (Append _) = 2        | resultArity (Append _) = 2
135        | resultArity (Prepend _) = 2        | resultArity (Prepend _) = 2
136        | resultArity (Concat _) = 2        | resultArity (Concat _) = 2
137        | resultArity (Length _) = 1        | resultArity Sqrt = 1
138        | resultArity (Ceiling _) = 1        | resultArity (Ceiling _) = 1
139        | resultArity (Floor _) = 1        | resultArity (Floor _) = 1
140        | resultArity (Round _) = 1        | resultArity (Round _) = 1
# Line 163  Line 149 
149        | resultArity (Inside _) = 1        | resultArity (Inside _) = 1
150        | resultArity (LoadSeq _) = 1        | resultArity (LoadSeq _) = 1
151        | resultArity (LoadImage _) = 1        | resultArity (LoadImage _) = 1
152          | resultArity (imgAddr _) = 1
153          | resultArity (imgLoad _) = 1
154        | resultArity (Input _) = 1        | resultArity (Input _) = 1
155        | resultArity (InputWithDefault _) = 1        | resultArity (InputWithDefault _) = 1
156        | resultArity (Print _) = 0        | resultArity (Print _) = 0
# Line 172  Line 160 
160        | arity IMul = 2        | arity IMul = 2
161        | arity IDiv = 2        | arity IDiv = 2
162        | arity INeg = 1        | arity INeg = 1
163          | arity (IndexTensor _) = 2
164          | arity addSca = 2
165          | arity subSca = 2
166          | arity prodSca = 2
167          | arity divSca = 2
168          | arity (addVec _) = 2
169          | arity (subVec _) = 2
170          | arity (prodVec _) = 2
171          | arity (prodScaV _) = 2
172          | arity (sumVec _) = 2
173        | arity (Abs _) = 1        | arity (Abs _) = 1
174        | arity (LT _) = 2        | arity (LT _) = 2
175        | arity (LTE _) = 2        | arity (LTE _) = 2
# Line 182  Line 180 
180        | arity Not = 1        | arity Not = 1
181        | arity Max = 2        | arity Max = 2
182        | arity Min = 2        | arity Min = 2
       | arity (C _) = 2  
       | arity (V _) = 2  
       | arity (S _) = 2  
       | arity addSca = 2  
       | arity subSca = 2  
       | arity prodSca = 2  
       | arity divSca = 2  
       | arity (cons _) = 2  
       | arity (img _) = 2  
       | arity (imgAddr _) = 2  
       | arity (imgLoad _) = 2  
       | arity (addVec _) = 2  
       | arity (subVec _) = 2  
       | arity (prodVec _) = 2  
       | arity (prodScaV _) = 2  
       | arity (sumVec _) = 2  
183        | arity (Clamp _) = 3        | arity (Clamp _) = 3
184        | arity (Lerp _) = 3        | arity (Lerp _) = 3
       | arity (Norm _) = 1  
       | arity (Normalize _) = 1  
185        | arity (PrincipleEvec _) = 2        | arity (PrincipleEvec _) = 2
186        | arity EigenVecs2x2 = 1        | arity EigenVecs2x2 = 1
187        | arity EigenVecs3x3 = 1        | arity EigenVecs3x3 = 1
# Line 215  Line 195 
195        | arity (Append _) = 1        | arity (Append _) = 1
196        | arity (Prepend _) = 1        | arity (Prepend _) = 1
197        | arity (Concat _) = 1        | arity (Concat _) = 1
198        | arity (Length _) = 1        | arity Sqrt = 1
199        | arity (Ceiling _) = 1        | arity (Ceiling _) = 1
200        | arity (Floor _) = 1        | arity (Floor _) = 1
201        | arity (Round _) = 1        | arity (Round _) = 1
# Line 230  Line 210 
210        | arity (Inside _) = 2        | arity (Inside _) = 2
211        | arity (LoadSeq _) = 0        | arity (LoadSeq _) = 0
212        | arity (LoadImage _) = 0        | arity (LoadImage _) = 0
213          | arity (imgAddr _) = 2
214          | arity (imgLoad _) = 2
215        | arity (Input _) = 0        | arity (Input _) = 0
216        | arity (InputWithDefault _) = 1        | arity (InputWithDefault _) = 1
217        | arity (Print _) = ~1        | arity (Print _) = ~1
# Line 246  Line 228 
228        | same (IMul, IMul) = true        | same (IMul, IMul) = true
229        | same (IDiv, IDiv) = true        | same (IDiv, IDiv) = true
230        | same (INeg, INeg) = true        | same (INeg, INeg) = true
231          | same (IndexTensor(a0,a1,a2,a3), IndexTensor(b0,b1,b2,b3)) = sameint(a0, b0) andalso samety(a1, b1) andalso samety(a2, b2) andalso samety(a3, b3)
232          | same (addSca, addSca) = true
233          | same (subSca, subSca) = true
234          | same (prodSca, prodSca) = true
235          | same (divSca, divSca) = true
236          | same (addVec(a0), addVec(b0)) = sameint(a0, b0)
237          | same (subVec(a0), subVec(b0)) = sameint(a0, b0)
238          | same (prodVec(a0), prodVec(b0)) = sameint(a0, b0)
239          | same (prodScaV(a0), prodScaV(b0)) = sameint(a0, b0)
240          | same (sumVec(a0), sumVec(b0)) = sameint(a0, b0)
241        | same (Abs(a0), Abs(b0)) = samety(a0, b0)        | same (Abs(a0), Abs(b0)) = samety(a0, b0)
242        | same (LT(a0), LT(b0)) = samety(a0, b0)        | same (LT(a0), LT(b0)) = samety(a0, b0)
243        | same (LTE(a0), LTE(b0)) = samety(a0, b0)        | same (LTE(a0), LTE(b0)) = samety(a0, b0)
# Line 256  Line 248 
248        | same (Not, Not) = true        | same (Not, Not) = true
249        | same (Max, Max) = true        | same (Max, Max) = true
250        | same (Min, Min) = true        | same (Min, Min) = true
       | same (C(a0), C(b0)) = sameint(a0, b0)  
       | same (V(a0,a1,a2,a3), V(b0,b1,b2,b3)) = sameint(a0, b0) andalso sameint(a1, b1) andalso samety(a2, b2) andalso samety(a3, b3)  
       | same (S(a0,a1,a2), S(b0,b1,b2)) = sameint(a0, b0) andalso samety(a1, b1) andalso samety(a2, b2)  
       | same (addSca, addSca) = true  
       | same (subSca, subSca) = true  
       | same (prodSca, prodSca) = true  
       | same (divSca, divSca) = true  
       | same (cons(a0), cons(b0)) = samety(a0, b0)  
       | same (img(a0,a1,a2), img(b0,b1,b2)) = sameint(a0, b0) andalso samety(a1, b1) andalso sameint(a2, b2)  
       | same (imgAddr(a0,a1), imgAddr(b0,b1)) = samety(a0, b0) andalso sameint(a1, b1)  
       | same (imgLoad(a0,a1), imgLoad(b0,b1)) = sameint(a0, b0) andalso sameint(a1, b1)  
       | same (addVec(a0), addVec(b0)) = sameint(a0, b0)  
       | same (subVec(a0), subVec(b0)) = sameint(a0, b0)  
       | same (prodVec(a0), prodVec(b0)) = sameint(a0, b0)  
       | same (prodScaV(a0), prodScaV(b0)) = sameint(a0, b0)  
       | same (sumVec(a0), sumVec(b0)) = sameint(a0, b0)  
251        | same (Clamp(a0), Clamp(b0)) = samety(a0, b0)        | same (Clamp(a0), Clamp(b0)) = samety(a0, b0)
252        | same (Lerp(a0), Lerp(b0)) = samety(a0, b0)        | same (Lerp(a0), Lerp(b0)) = samety(a0, b0)
       | same (Norm(a0), Norm(b0)) = samety(a0, b0)  
       | same (Normalize(a0), Normalize(b0)) = sameint(a0, b0)  
253        | same (PrincipleEvec(a0), PrincipleEvec(b0)) = samety(a0, b0)        | same (PrincipleEvec(a0), PrincipleEvec(b0)) = samety(a0, b0)
254        | same (EigenVecs2x2, EigenVecs2x2) = true        | same (EigenVecs2x2, EigenVecs2x2) = true
255        | same (EigenVecs3x3, EigenVecs3x3) = true        | same (EigenVecs3x3, EigenVecs3x3) = true
# Line 289  Line 263 
263        | same (Append(a0), Append(b0)) = samety(a0, b0)        | same (Append(a0), Append(b0)) = samety(a0, b0)
264        | same (Prepend(a0), Prepend(b0)) = samety(a0, b0)        | same (Prepend(a0), Prepend(b0)) = samety(a0, b0)
265        | same (Concat(a0), Concat(b0)) = samety(a0, b0)        | same (Concat(a0), Concat(b0)) = samety(a0, b0)
266        | same (Length(a0), Length(b0)) = samety(a0, b0)        | same (Sqrt, Sqrt) = true
267        | same (Ceiling(a0), Ceiling(b0)) = sameint(a0, b0)        | same (Ceiling(a0), Ceiling(b0)) = sameint(a0, b0)
268        | same (Floor(a0), Floor(b0)) = sameint(a0, b0)        | same (Floor(a0), Floor(b0)) = sameint(a0, b0)
269        | same (Round(a0), Round(b0)) = sameint(a0, b0)        | same (Round(a0), Round(b0)) = sameint(a0, b0)
# Line 304  Line 278 
278        | same (Inside(a0,a1), Inside(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)        | same (Inside(a0,a1), Inside(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)
279        | same (LoadSeq(a0,a1), LoadSeq(b0,b1)) = samety(a0, b0) andalso samestring(a1, b1)        | same (LoadSeq(a0,a1), LoadSeq(b0,b1)) = samety(a0, b0) andalso samestring(a1, b1)
280        | same (LoadImage(a0), LoadImage(b0)) = ImageInfo.same(a0, b0)        | same (LoadImage(a0), LoadImage(b0)) = ImageInfo.same(a0, b0)
281          | same (imgAddr(a0,a1,a2), imgAddr(b0,b1,b2)) = ImageInfo.same(a0, b0) andalso samety(a1, b1) andalso sameint(a2, b2)
282          | same (imgLoad(a0,a1,a2), imgLoad(b0,b1,b2)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1) andalso sameint(a2, b2)
283        | same (Input(a0,a1,a2), Input(b0,b1,b2)) = samety(a0, b0) andalso samestring(a1, b1) andalso samestring(a2, b2)        | same (Input(a0,a1,a2), Input(b0,b1,b2)) = samety(a0, b0) andalso samestring(a1, b1) andalso samestring(a2, b2)
284        | same (InputWithDefault(a0,a1,a2), InputWithDefault(b0,b1,b2)) = samety(a0, b0) andalso samestring(a1, b1) andalso samestring(a2, b2)        | same (InputWithDefault(a0,a1,a2), InputWithDefault(b0,b1,b2)) = samety(a0, b0) andalso samestring(a1, b1) andalso samestring(a2, b2)
285        | same (Print(a0), Print(b0)) = sametys(a0, b0)        | same (Print(a0), Print(b0)) = sametys(a0, b0)
# Line 314  Line 290 
290        | hash IMul = 0w7        | hash IMul = 0w7
291        | hash IDiv = 0w11        | hash IDiv = 0w11
292        | hash INeg = 0w13        | hash INeg = 0w13
293        | hash (Abs(a0)) = 0w17 + hashty a0        | hash (IndexTensor(a0,a1,a2,a3)) = 0w17 + hashint a0 + hashty a1 + hashty a2 + hashty a3
294        | hash (LT(a0)) = 0w19 + hashty a0        | hash addSca = 0w19
295        | hash (LTE(a0)) = 0w23 + hashty a0        | hash subSca = 0w23
296        | hash (EQ(a0)) = 0w29 + hashty a0        | hash prodSca = 0w29
297        | hash (NEQ(a0)) = 0w31 + hashty a0        | hash divSca = 0w31
298        | hash (GT(a0)) = 0w37 + hashty a0        | hash (addVec(a0)) = 0w37 + hashint a0
299        | hash (GTE(a0)) = 0w41 + hashty a0        | hash (subVec(a0)) = 0w41 + hashint a0
300        | hash Not = 0w43        | hash (prodVec(a0)) = 0w43 + hashint a0
301        | hash Max = 0w47        | hash (prodScaV(a0)) = 0w47 + hashint a0
302        | hash Min = 0w53        | hash (sumVec(a0)) = 0w53 + hashint a0
303        | hash (C(a0)) = 0w59 + hashint a0        | hash (Abs(a0)) = 0w59 + hashty a0
304        | hash (V(a0,a1,a2,a3)) = 0w61 + hashint a0 + hashint a1 + hashty a2 + hashty a3        | hash (LT(a0)) = 0w61 + hashty a0
305        | hash (S(a0,a1,a2)) = 0w67 + hashint a0 + hashty a1 + hashty a2        | hash (LTE(a0)) = 0w67 + hashty a0
306        | hash addSca = 0w71        | hash (EQ(a0)) = 0w71 + hashty a0
307        | hash subSca = 0w73        | hash (NEQ(a0)) = 0w73 + hashty a0
308        | hash prodSca = 0w79        | hash (GT(a0)) = 0w79 + hashty a0
309        | hash divSca = 0w83        | hash (GTE(a0)) = 0w83 + hashty a0
310        | hash (cons(a0)) = 0w89 + hashty a0        | hash Not = 0w89
311        | hash (img(a0,a1,a2)) = 0w97 + hashint a0 + hashty a1 + hashint a2        | hash Max = 0w97
312        | hash (imgAddr(a0,a1)) = 0w101 + hashty a0 + hashint a1        | hash Min = 0w101
313        | hash (imgLoad(a0,a1)) = 0w103 + hashint a0 + hashint a1        | hash (Clamp(a0)) = 0w103 + hashty a0
314        | hash (addVec(a0)) = 0w107 + hashint a0        | hash (Lerp(a0)) = 0w107 + hashty a0
315        | hash (subVec(a0)) = 0w109 + hashint a0        | hash (PrincipleEvec(a0)) = 0w109 + hashty a0
316        | hash (prodVec(a0)) = 0w113 + hashint a0        | hash EigenVecs2x2 = 0w113
317        | hash (prodScaV(a0)) = 0w127 + hashint a0        | hash EigenVecs3x3 = 0w127
318        | hash (sumVec(a0)) = 0w131 + hashint a0        | hash EigenVals2x2 = 0w131
319        | hash (Clamp(a0)) = 0w137 + hashty a0        | hash EigenVals3x3 = 0w137
320        | hash (Lerp(a0)) = 0w139 + hashty a0        | hash (Zero(a0)) = 0w139 + hashty a0
321        | hash (Norm(a0)) = 0w149 + hashty a0        | hash (Select(a0,a1)) = 0w149 + hashty a0 + hashint a1
322        | hash (Normalize(a0)) = 0w151 + hashint a0        | hash (Index(a0,a1)) = 0w151 + hashty a0 + hashint a1
323        | hash (PrincipleEvec(a0)) = 0w157 + hashty a0        | hash (Subscript(a0)) = 0w157 + hashty a0
324        | hash EigenVecs2x2 = 0w163        | hash (MkDynamic(a0,a1)) = 0w163 + hashty a0 + hashint a1
325        | hash EigenVecs3x3 = 0w167        | hash (Append(a0)) = 0w167 + hashty a0
326        | hash EigenVals2x2 = 0w173        | hash (Prepend(a0)) = 0w173 + hashty a0
327        | hash EigenVals3x3 = 0w179        | hash (Concat(a0)) = 0w179 + hashty a0
328        | hash (Zero(a0)) = 0w181 + hashty a0        | hash Sqrt = 0w181
329        | hash (Select(a0,a1)) = 0w191 + hashty a0 + hashint a1        | hash (Ceiling(a0)) = 0w191 + hashint a0
330        | hash (Index(a0,a1)) = 0w193 + hashty a0 + hashint a1        | hash (Floor(a0)) = 0w193 + hashint a0
331        | hash (Subscript(a0)) = 0w197 + hashty a0        | hash (Round(a0)) = 0w197 + hashint a0
332        | hash (MkDynamic(a0,a1)) = 0w199 + hashty a0 + hashint a1        | hash (Trunc(a0)) = 0w199 + hashint a0
333        | hash (Append(a0)) = 0w211 + hashty a0        | hash IntToReal = 0w211
334        | hash (Prepend(a0)) = 0w223 + hashty a0        | hash (RealToInt(a0)) = 0w223 + hashint a0
335        | hash (Concat(a0)) = 0w227 + hashty a0        | hash (Transform(a0)) = 0w227 + ImageInfo.hash a0
336        | hash (Length(a0)) = 0w229 + hashty a0        | hash (Translate(a0)) = 0w229 + ImageInfo.hash a0
337        | hash (Ceiling(a0)) = 0w233 + hashint a0        | hash (Kernel(a0,a1)) = 0w233 + Kernel.hash a0 + hashint a1
338        | hash (Floor(a0)) = 0w239 + hashint a0        | hash (ImageAddress(a0)) = 0w239 + ImageInfo.hash a0
339        | hash (Round(a0)) = 0w241 + hashint a0        | hash (LoadVoxels(a0,a1)) = 0w241 + ImageInfo.hash a0 + hashint a1
340        | hash (Trunc(a0)) = 0w251 + hashint a0        | hash (Inside(a0,a1)) = 0w251 + ImageInfo.hash a0 + hashint a1
341        | hash IntToReal = 0w257        | hash (LoadSeq(a0,a1)) = 0w257 + hashty a0 + hashstring a1
342        | hash (RealToInt(a0)) = 0w263 + hashint a0        | hash (LoadImage(a0)) = 0w263 + ImageInfo.hash a0
343        | hash (Transform(a0)) = 0w269 + ImageInfo.hash a0        | hash (imgAddr(a0,a1,a2)) = 0w269 + ImageInfo.hash a0 + hashty a1 + hashint a2
344        | hash (Translate(a0)) = 0w271 + ImageInfo.hash a0        | hash (imgLoad(a0,a1,a2)) = 0w271 + ImageInfo.hash a0 + hashint a1 + hashint a2
345        | hash (Kernel(a0,a1)) = 0w277 + Kernel.hash a0 + hashint a1        | hash (Input(a0,a1,a2)) = 0w277 + hashty a0 + hashstring a1 + hashstring a2
346        | hash (ImageAddress(a0)) = 0w281 + ImageInfo.hash a0        | hash (InputWithDefault(a0,a1,a2)) = 0w281 + hashty a0 + hashstring a1 + hashstring a2
347        | hash (LoadVoxels(a0,a1)) = 0w283 + ImageInfo.hash a0 + hashint a1        | hash (Print(a0)) = 0w283 + hashtys a0
       | hash (Inside(a0,a1)) = 0w293 + ImageInfo.hash a0 + hashint a1  
       | hash (LoadSeq(a0,a1)) = 0w307 + hashty a0 + hashstring a1  
       | hash (LoadImage(a0)) = 0w311 + ImageInfo.hash a0  
       | hash (Input(a0,a1,a2)) = 0w313 + hashty a0 + hashstring a1 + hashstring a2  
       | hash (InputWithDefault(a0,a1,a2)) = 0w317 + hashty a0 + hashstring a1 + hashstring a2  
       | hash (Print(a0)) = 0w331 + hashtys a0  
348    
349      fun toString IAdd = "IAdd"      fun toString IAdd = "IAdd"
350        | toString ISub = "ISub"        | toString ISub = "ISub"
351        | toString IMul = "IMul"        | toString IMul = "IMul"
352        | toString IDiv = "IDiv"        | toString IDiv = "IDiv"
353        | toString INeg = "INeg"        | toString INeg = "INeg"
354          | toString (IndexTensor(a0,a1,a2,a3)) = concat["IndexTensor<", intToString a0, ",", tyToString a1, ",", tyToString a2, ",", tyToString a3, ">"]
355          | toString addSca = "addSca"
356          | toString subSca = "subSca"
357          | toString prodSca = "prodSca"
358          | toString divSca = "divSca"
359          | toString (addVec(a0)) = concat["addVec<", intToString a0, ">"]
360          | toString (subVec(a0)) = concat["subVec<", intToString a0, ">"]
361          | toString (prodVec(a0)) = concat["prodVec<", intToString a0, ">"]
362          | toString (prodScaV(a0)) = concat["prodScaV<", intToString a0, ">"]
363          | toString (sumVec(a0)) = concat["sumVec<", intToString a0, ">"]
364        | toString (Abs(a0)) = concat["Abs<", tyToString a0, ">"]        | toString (Abs(a0)) = concat["Abs<", tyToString a0, ">"]
365        | toString (LT(a0)) = concat["LT<", tyToString a0, ">"]        | toString (LT(a0)) = concat["LT<", tyToString a0, ">"]
366        | toString (LTE(a0)) = concat["LTE<", tyToString a0, ">"]        | toString (LTE(a0)) = concat["LTE<", tyToString a0, ">"]
# Line 391  Line 371 
371        | toString Not = "Not"        | toString Not = "Not"
372        | toString Max = "Max"        | toString Max = "Max"
373        | toString Min = "Min"        | toString Min = "Min"
       | toString (C(a0)) = concat["C<", intToString a0, ">"]  
       | toString (V(a0,a1,a2,a3)) = concat["V<", intToString a0, ",", intToString a1, ",", tyToString a2, ",", tyToString a3, ">"]  
       | toString (S(a0,a1,a2)) = concat["S<", intToString a0, ",", tyToString a1, ",", tyToString a2, ">"]  
       | toString addSca = "addSca"  
       | toString subSca = "subSca"  
       | toString prodSca = "prodSca"  
       | toString divSca = "divSca"  
       | toString (cons(a0)) = concat["cons<", tyToString a0, ">"]  
       | toString (img(a0,a1,a2)) = concat["img<", intToString a0, ",", tyToString a1, ",", intToString a2, ">"]  
       | toString (imgAddr(a0,a1)) = concat["imgAddr<", tyToString a0, ",", intToString a1, ">"]  
       | toString (imgLoad(a0,a1)) = concat["imgLoad<", intToString a0, ",", intToString a1, ">"]  
       | toString (addVec(a0)) = concat["addVec<", intToString a0, ">"]  
       | toString (subVec(a0)) = concat["subVec<", intToString a0, ">"]  
       | toString (prodVec(a0)) = concat["prodVec<", intToString a0, ">"]  
       | toString (prodScaV(a0)) = concat["prodScaV<", intToString a0, ">"]  
       | toString (sumVec(a0)) = concat["sumVec<", intToString a0, ">"]  
374        | toString (Clamp(a0)) = concat["Clamp<", tyToString a0, ">"]        | toString (Clamp(a0)) = concat["Clamp<", tyToString a0, ">"]
375        | toString (Lerp(a0)) = concat["Lerp<", tyToString a0, ">"]        | toString (Lerp(a0)) = concat["Lerp<", tyToString a0, ">"]
       | toString (Norm(a0)) = concat["Norm<", tyToString a0, ">"]  
       | toString (Normalize(a0)) = concat["Normalize<", intToString a0, ">"]  
376        | toString (PrincipleEvec(a0)) = concat["PrincipleEvec<", tyToString a0, ">"]        | toString (PrincipleEvec(a0)) = concat["PrincipleEvec<", tyToString a0, ">"]
377        | toString EigenVecs2x2 = "EigenVecs2x2"        | toString EigenVecs2x2 = "EigenVecs2x2"
378        | toString EigenVecs3x3 = "EigenVecs3x3"        | toString EigenVecs3x3 = "EigenVecs3x3"
# Line 424  Line 386 
386        | toString (Append(a0)) = concat["Append<", tyToString a0, ">"]        | toString (Append(a0)) = concat["Append<", tyToString a0, ">"]
387        | toString (Prepend(a0)) = concat["Prepend<", tyToString a0, ">"]        | toString (Prepend(a0)) = concat["Prepend<", tyToString a0, ">"]
388        | toString (Concat(a0)) = concat["Concat<", tyToString a0, ">"]        | toString (Concat(a0)) = concat["Concat<", tyToString a0, ">"]
389        | toString (Length(a0)) = concat["Length<", tyToString a0, ">"]        | toString Sqrt = "Sqrt"
390        | toString (Ceiling(a0)) = concat["Ceiling<", intToString a0, ">"]        | toString (Ceiling(a0)) = concat["Ceiling<", intToString a0, ">"]
391        | toString (Floor(a0)) = concat["Floor<", intToString a0, ">"]        | toString (Floor(a0)) = concat["Floor<", intToString a0, ">"]
392        | toString (Round(a0)) = concat["Round<", intToString a0, ">"]        | toString (Round(a0)) = concat["Round<", intToString a0, ">"]
# Line 439  Line 401 
401        | toString (Inside(a0,a1)) = concat["Inside<", ImageInfo.toString a0, ",", intToString a1, ">"]        | toString (Inside(a0,a1)) = concat["Inside<", ImageInfo.toString a0, ",", intToString a1, ">"]
402        | toString (LoadSeq(a0,a1)) = concat["LoadSeq<", tyToString a0, ",", stringToString a1, ">"]        | toString (LoadSeq(a0,a1)) = concat["LoadSeq<", tyToString a0, ",", stringToString a1, ">"]
403        | toString (LoadImage(a0)) = concat["LoadImage<", ImageInfo.toString a0, ">"]        | toString (LoadImage(a0)) = concat["LoadImage<", ImageInfo.toString a0, ">"]
404          | toString (imgAddr(a0,a1,a2)) = concat["imgAddr<", ImageInfo.toString a0, ",", tyToString a1, ",", intToString a2, ">"]
405          | toString (imgLoad(a0,a1,a2)) = concat["imgLoad<", ImageInfo.toString a0, ",", intToString a1, ",", intToString a2, ">"]
406        | toString (Input(a0,a1,a2)) = concat["Input<", tyToString a0, ",", stringToString a1, ",", stringToString a2, ">"]        | toString (Input(a0,a1,a2)) = concat["Input<", tyToString a0, ",", stringToString a1, ",", stringToString a2, ">"]
407        | toString (InputWithDefault(a0,a1,a2)) = concat["InputWithDefault<", tyToString a0, ",", stringToString a1, ",", stringToString a2, ">"]        | toString (InputWithDefault(a0,a1,a2)) = concat["InputWithDefault<", tyToString a0, ",", stringToString a1, ",", stringToString a2, ">"]
408        | toString (Print(a0)) = concat["Print<", tysToString a0, ">"]        | toString (Print(a0)) = concat["Print<", tysToString a0, ">"]

Legend:
Removed from v.2529  
changed lines
  Added in v.2668

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0