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

SCM Repository

[diderot] Diff of /branches/vis12/src/compiler/mid-il/mid-il.sml
ViewVC logotype

Diff of /branches/vis12/src/compiler/mid-il/mid-il.sml

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

revision 287, Fri Aug 13 21:40:04 2010 UTC revision 314, Tue Aug 17 21:49:25 2010 UTC
# Line 64  Line 64 
64        | LoadVoxels of RawTypes.ty * int        | LoadVoxels of RawTypes.ty * int
65        | Transform of ImageInfo.info        | Transform of ImageInfo.info
66        | Kernel of Kernel.kernel        | Kernel of Kernel.kernel
67        | DiffKernel of int        | DiffKernel
68        | EvalKernel        | EvalKernel of int
69        | LoadImage of ImageInfo.info        | LoadImage of ImageInfo.info
70        | Inside        | Inside
71        | Input of string        | Input of string
# Line 106  Line 106 
106        | arity (LoadVoxels _) = 1        | arity (LoadVoxels _) = 1
107        | arity (Transform _) = 1        | arity (Transform _) = 1
108        | arity (Kernel _) = 0        | arity (Kernel _) = 0
109        | arity (DiffKernel _) = 1        | arity DiffKernel = 1
110        | arity EvalKernel = 2        | arity (EvalKernel _) = 2
111        | arity (LoadImage _) = 0        | arity (LoadImage _) = 0
112        | arity Inside = 2        | arity Inside = 2
113        | arity (Input _) = 0        | arity (Input _) = 0
# Line 148  Line 148 
148        | same (LoadVoxels(a0,a1), LoadVoxels(b0,b1)) = RawTypes.same(a0, b0) andalso sameint(a1, b1)        | same (LoadVoxels(a0,a1), LoadVoxels(b0,b1)) = RawTypes.same(a0, b0) andalso sameint(a1, b1)
149        | same (Transform(a0), Transform(b0)) = ImageInfo.same(a0, b0)        | same (Transform(a0), Transform(b0)) = ImageInfo.same(a0, b0)
150        | same (Kernel(a0), Kernel(b0)) = Kernel.same(a0, b0)        | same (Kernel(a0), Kernel(b0)) = Kernel.same(a0, b0)
151        | same (DiffKernel(a0), DiffKernel(b0)) = sameint(a0, b0)        | same (DiffKernel, DiffKernel) = true
152        | same (EvalKernel, EvalKernel) = true        | same (EvalKernel(a0), EvalKernel(b0)) = sameint(a0, b0)
153        | same (LoadImage(a0), LoadImage(b0)) = ImageInfo.same(a0, b0)        | same (LoadImage(a0), LoadImage(b0)) = ImageInfo.same(a0, b0)
154        | same (Inside, Inside) = true        | same (Inside, Inside) = true
155        | same (Input(a0), Input(b0)) = samestring(a0, b0)        | same (Input(a0), Input(b0)) = samestring(a0, b0)
# Line 191  Line 191 
191        | hash (LoadVoxels(a0,a1)) = 0w139 + RawTypes.hash a0 + hashint a1        | hash (LoadVoxels(a0,a1)) = 0w139 + RawTypes.hash a0 + hashint a1
192        | hash (Transform(a0)) = 0w149 + ImageInfo.hash a0        | hash (Transform(a0)) = 0w149 + ImageInfo.hash a0
193        | hash (Kernel(a0)) = 0w151 + Kernel.hash a0        | hash (Kernel(a0)) = 0w151 + Kernel.hash a0
194        | hash (DiffKernel(a0)) = 0w157 + hashint a0        | hash DiffKernel = 0w157
195        | hash EvalKernel = 0w163        | hash (EvalKernel(a0)) = 0w163 + hashint a0
196        | hash (LoadImage(a0)) = 0w167 + ImageInfo.hash a0        | hash (LoadImage(a0)) = 0w167 + ImageInfo.hash a0
197        | hash Inside = 0w173        | hash Inside = 0w173
198        | hash (Input(a0)) = 0w179 + hashstring a0        | hash (Input(a0)) = 0w179 + hashstring a0
# Line 233  Line 233 
233        | toString (LoadVoxels(a0,a1)) = concat["LoadVoxels<", RawTypes.toString a0",", intToString a0, ">"]        | toString (LoadVoxels(a0,a1)) = concat["LoadVoxels<", RawTypes.toString a0",", intToString a0, ">"]
234        | toString (Transform(a0)) = concat["Transform<", ImageInfo.toString a0, ">"]        | toString (Transform(a0)) = concat["Transform<", ImageInfo.toString a0, ">"]
235        | toString (Kernel(a0)) = concat["Kernel<", Kernel.toString a0, ">"]        | toString (Kernel(a0)) = concat["Kernel<", Kernel.toString a0, ">"]
236        | toString (DiffKernel(a0)) = concat["DiffKernel<", intToString a0, ">"]        | toString DiffKernel = "DiffKernel"
237        | toString EvalKernel = "EvalKernel"        | toString (EvalKernel(a0)) = concat["EvalKernel<", intToString a0, ">"]
238        | toString (LoadImage(a0)) = concat["LoadImage<", ImageInfo.toString a0, ">"]        | toString (LoadImage(a0)) = concat["LoadImage<", ImageInfo.toString a0, ">"]
239        | toString Inside = "Inside"        | toString Inside = "Inside"
240        | toString (Input(a0)) = concat["Input<", stringToString a0, ">"]        | toString (Input(a0)) = concat["Input<", stringToString a0, ">"]

Legend:
Removed from v.287  
changed lines
  Added in v.314

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