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

# SCM Repository

[diderot] Diff of /trunk/src/compiler/mid-il/mid-il.sml
 [diderot] / trunk / src / compiler / mid-il / mid-il.sml

# Diff of /trunk/src/compiler/mid-il/mid-il.sml

revision 348, Wed Sep 22 15:52:48 2010 UTC revision 349, Fri Sep 24 00:24:20 2010 UTC
# Line 52  Line 52
52        | Sin        | Sin
53        | Cos        | Cos
54        | Pow        | Pow
55        | Dot of ty        | Dot of int
56        | Cross        | Cross
57        | Select of int        | Select of int * int
58        | Norm of ty        | Norm of int
59        | Scale of ty        | Scale of int
60        | InvScale of ty        | InvScale of int
61        | CL        | CL
62        | PrincipleEvec of ty        | PrincipleEvec of ty
63        | Subscript of ty        | Subscript of ty
# Line 72  Line 72
72        | Transform of ImageInfo.info        | Transform of ImageInfo.info
73        | EvalKernel of int * Kernel.kernel * int        | EvalKernel of int * Kernel.kernel * int
74        | LoadImage of ImageInfo.info        | LoadImage of ImageInfo.info
75        | Inside        | Inside of ImageInfo.info
76        | Input of string        | Input of string
77        | InputWithDefault of string        | InputWithDefault of string
78
# Line 113  Line 113
113        | arity (Transform _) = 1        | arity (Transform _) = 1
114        | arity (EvalKernel _) = 1        | arity (EvalKernel _) = 1
115        | arity (LoadImage _) = 0        | arity (LoadImage _) = 0
116        | arity Inside = 2        | arity (Inside _) = 1
117        | arity (Input _) = 0        | arity (Input _) = 0
118        | arity (InputWithDefault _) = 1        | arity (InputWithDefault _) = 1
119
# Line 134  Line 134
134        | same (Sin, Sin) = true        | same (Sin, Sin) = true
135        | same (Cos, Cos) = true        | same (Cos, Cos) = true
136        | same (Pow, Pow) = true        | same (Pow, Pow) = true
137        | same (Dot(a0), Dot(b0)) = samety(a0, b0)        | same (Dot(a0), Dot(b0)) = sameint(a0, b0)
138        | same (Cross, Cross) = true        | same (Cross, Cross) = true
139        | same (Select(a0), Select(b0)) = sameint(a0, b0)        | same (Select(a0,a1), Select(b0,b1)) = sameint(a0, b0) andalso sameint(a1, b1)
140        | same (Norm(a0), Norm(b0)) = samety(a0, b0)        | same (Norm(a0), Norm(b0)) = sameint(a0, b0)
141        | same (Scale(a0), Scale(b0)) = samety(a0, b0)        | same (Scale(a0), Scale(b0)) = sameint(a0, b0)
142        | same (InvScale(a0), InvScale(b0)) = samety(a0, b0)        | same (InvScale(a0), InvScale(b0)) = sameint(a0, b0)
143        | same (CL, CL) = true        | same (CL, CL) = true
144        | same (PrincipleEvec(a0), PrincipleEvec(b0)) = samety(a0, b0)        | same (PrincipleEvec(a0), PrincipleEvec(b0)) = samety(a0, b0)
145        | same (Subscript(a0), Subscript(b0)) = samety(a0, b0)        | same (Subscript(a0), Subscript(b0)) = samety(a0, b0)
# Line 154  Line 154
154        | same (Transform(a0), Transform(b0)) = ImageInfo.same(a0, b0)        | same (Transform(a0), Transform(b0)) = ImageInfo.same(a0, b0)
155        | same (EvalKernel(a0,a1,a2), EvalKernel(b0,b1,b2)) = sameint(a0, b0) andalso Kernel.same(a1, b1) andalso sameint(a2, b2)        | same (EvalKernel(a0,a1,a2), EvalKernel(b0,b1,b2)) = sameint(a0, b0) andalso Kernel.same(a1, b1) andalso sameint(a2, b2)
156        | same (LoadImage(a0), LoadImage(b0)) = ImageInfo.same(a0, b0)        | same (LoadImage(a0), LoadImage(b0)) = ImageInfo.same(a0, b0)
157        | same (Inside, Inside) = true        | same (Inside(a0), Inside(b0)) = ImageInfo.same(a0, b0)
158        | same (Input(a0), Input(b0)) = samestring(a0, b0)        | same (Input(a0), Input(b0)) = samestring(a0, b0)
159        | same (InputWithDefault(a0), InputWithDefault(b0)) = samestring(a0, b0)        | same (InputWithDefault(a0), InputWithDefault(b0)) = samestring(a0, b0)
160        | same _ = false        | same _ = false
# Line 176  Line 176
176        | hash Sin = 0w53        | hash Sin = 0w53
177        | hash Cos = 0w59        | hash Cos = 0w59
178        | hash Pow = 0w61        | hash Pow = 0w61
179        | hash (Dot(a0)) = 0w67 + hashty a0        | hash (Dot(a0)) = 0w67 + hashint a0
180        | hash Cross = 0w71        | hash Cross = 0w71
181        | hash (Select(a0)) = 0w73 + hashint a0        | hash (Select(a0,a1)) = 0w73 + hashint a0 + hashint a1
182        | hash (Norm(a0)) = 0w79 + hashty a0        | hash (Norm(a0)) = 0w79 + hashint a0
183        | hash (Scale(a0)) = 0w83 + hashty a0        | hash (Scale(a0)) = 0w83 + hashint a0
184        | hash (InvScale(a0)) = 0w89 + hashty a0        | hash (InvScale(a0)) = 0w89 + hashint a0
185        | hash CL = 0w97        | hash CL = 0w97
186        | hash (PrincipleEvec(a0)) = 0w101 + hashty a0        | hash (PrincipleEvec(a0)) = 0w101 + hashty a0
187        | hash (Subscript(a0)) = 0w103 + hashty a0        | hash (Subscript(a0)) = 0w103 + hashty a0
# Line 196  Line 196
196        | hash (Transform(a0)) = 0w151 + ImageInfo.hash a0        | hash (Transform(a0)) = 0w151 + ImageInfo.hash a0
197        | hash (EvalKernel(a0,a1,a2)) = 0w157 + hashint a0 + Kernel.hash a1 + hashint a2        | hash (EvalKernel(a0,a1,a2)) = 0w157 + hashint a0 + Kernel.hash a1 + hashint a2
198        | hash (LoadImage(a0)) = 0w163 + ImageInfo.hash a0        | hash (LoadImage(a0)) = 0w163 + ImageInfo.hash a0
199        | hash Inside = 0w167        | hash (Inside(a0)) = 0w167 + ImageInfo.hash a0
200        | hash (Input(a0)) = 0w173 + hashstring a0        | hash (Input(a0)) = 0w173 + hashstring a0
201        | hash (InputWithDefault(a0)) = 0w179 + hashstring a0        | hash (InputWithDefault(a0)) = 0w179 + hashstring a0
202
# Line 217  Line 217
217        | toString Sin = "Sin"        | toString Sin = "Sin"
218        | toString Cos = "Cos"        | toString Cos = "Cos"
219        | toString Pow = "Pow"        | toString Pow = "Pow"
220        | toString (Dot(a0)) = concat["Dot<", tyToString a0, ">"]        | toString (Dot(a0)) = concat["Dot<", intToString a0, ">"]
221        | toString Cross = "Cross"        | toString Cross = "Cross"
222        | toString (Select(a0)) = concat["Select<", intToString a0, ">"]        | toString (Select(a0,a1)) = concat["Select<", intToString a0, ",", intToString a1, ">"]
223        | toString (Norm(a0)) = concat["Norm<", tyToString a0, ">"]        | toString (Norm(a0)) = concat["Norm<", intToString a0, ">"]
224        | toString (Scale(a0)) = concat["Scale<", tyToString a0, ">"]        | toString (Scale(a0)) = concat["Scale<", intToString a0, ">"]
225        | toString (InvScale(a0)) = concat["InvScale<", tyToString a0, ">"]        | toString (InvScale(a0)) = concat["InvScale<", intToString a0, ">"]
226        | toString CL = "CL"        | toString CL = "CL"
227        | toString (PrincipleEvec(a0)) = concat["PrincipleEvec<", tyToString a0, ">"]        | toString (PrincipleEvec(a0)) = concat["PrincipleEvec<", tyToString a0, ">"]
228        | toString (Subscript(a0)) = concat["Subscript<", tyToString a0, ">"]        | toString (Subscript(a0)) = concat["Subscript<", tyToString a0, ">"]
# Line 237  Line 237
237        | toString (Transform(a0)) = concat["Transform<", ImageInfo.toString a0, ">"]        | toString (Transform(a0)) = concat["Transform<", ImageInfo.toString a0, ">"]
238        | toString (EvalKernel(a0,a1,a2)) = concat["EvalKernel<", intToString a0, ",", Kernel.toString a1, ",", intToString a2, ">"]        | toString (EvalKernel(a0,a1,a2)) = concat["EvalKernel<", intToString a0, ",", Kernel.toString a1, ",", intToString a2, ">"]
239        | toString (LoadImage(a0)) = concat["LoadImage<", ImageInfo.toString a0, ">"]        | toString (LoadImage(a0)) = concat["LoadImage<", ImageInfo.toString a0, ">"]
240        | toString Inside = "Inside"        | toString (Inside(a0)) = concat["Inside<", ImageInfo.toString a0, ">"]
241        | toString (Input(a0)) = concat["Input<", stringToString a0, ">"]        | toString (Input(a0)) = concat["Input<", stringToString a0, ">"]
242        | toString (InputWithDefault(a0)) = concat["InputWithDefault<", stringToString a0, ">"]        | toString (InputWithDefault(a0)) = concat["InputWithDefault<", stringToString a0, ">"]
243

Legend:
 Removed from v.348 changed lines Added in v.349

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