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

SCM Repository

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

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

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

revision 2038, Tue Oct 16 11:31:02 2012 UTC revision 2039, Wed Oct 17 16:10:37 2012 UTC
# Line 76  Line 76 
76        | Trunc of int        | Trunc of int
77        | IntToReal        | IntToReal
78        | RealToInt of int        | RealToInt of int
79        | RadiusQuery        | SphereQuery
80        | VoxelAddress of ImageInfo.info * int        | VoxelAddress of ImageInfo.info * int
81        | LoadVoxels of ImageInfo.info * int        | LoadVoxels of ImageInfo.info * int
82        | PosToImgSpace of ImageInfo.info        | PosToImgSpace of ImageInfo.info
# Line 130  Line 130 
130        | resultArity (Trunc _) = 1        | resultArity (Trunc _) = 1
131        | resultArity IntToReal = 1        | resultArity IntToReal = 1
132        | resultArity (RealToInt _) = 1        | resultArity (RealToInt _) = 1
133        | resultArity RadiusQuery = 1        | resultArity SphereQuery = 1
134        | resultArity (VoxelAddress _) = 1        | resultArity (VoxelAddress _) = 1
135        | resultArity (LoadVoxels _) = 1        | resultArity (LoadVoxels _) = 1
136        | resultArity (PosToImgSpace _) = 1        | resultArity (PosToImgSpace _) = 1
# Line 184  Line 184 
184        | arity (Trunc _) = 1        | arity (Trunc _) = 1
185        | arity IntToReal = 1        | arity IntToReal = 1
186        | arity (RealToInt _) = 1        | arity (RealToInt _) = 1
187        | arity RadiusQuery = 1        | arity SphereQuery = 1
188        | arity (VoxelAddress _) = ~1        | arity (VoxelAddress _) = ~1
189        | arity (LoadVoxels _) = 1        | arity (LoadVoxels _) = 1
190        | arity (PosToImgSpace _) = 2        | arity (PosToImgSpace _) = 2
# Line 238  Line 238 
238        | same (Trunc(a0), Trunc(b0)) = sameint(a0, b0)        | same (Trunc(a0), Trunc(b0)) = sameint(a0, b0)
239        | same (IntToReal, IntToReal) = true        | same (IntToReal, IntToReal) = true
240        | same (RealToInt(a0), RealToInt(b0)) = sameint(a0, b0)        | same (RealToInt(a0), RealToInt(b0)) = sameint(a0, b0)
241        | same (RadiusQuery, RadiusQuery) = true        | same (SphereQuery, SphereQuery) = true
242        | same (VoxelAddress(a0,a1), VoxelAddress(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)        | same (VoxelAddress(a0,a1), VoxelAddress(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)
243        | same (LoadVoxels(a0,a1), LoadVoxels(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)        | same (LoadVoxels(a0,a1), LoadVoxels(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)
244        | same (PosToImgSpace(a0), PosToImgSpace(b0)) = ImageInfo.same(a0, b0)        | same (PosToImgSpace(a0), PosToImgSpace(b0)) = ImageInfo.same(a0, b0)
# Line 293  Line 293 
293        | hash (Trunc(a0)) = 0w179 + hashint a0        | hash (Trunc(a0)) = 0w179 + hashint a0
294        | hash IntToReal = 0w181        | hash IntToReal = 0w181
295        | hash (RealToInt(a0)) = 0w191 + hashint a0        | hash (RealToInt(a0)) = 0w191 + hashint a0
296        | hash RadiusQuery = 0w193        | hash SphereQuery = 0w193
297        | hash (VoxelAddress(a0,a1)) = 0w197 + ImageInfo.hash a0 + hashint a1        | hash (VoxelAddress(a0,a1)) = 0w197 + ImageInfo.hash a0 + hashint a1
298        | hash (LoadVoxels(a0,a1)) = 0w199 + ImageInfo.hash a0 + hashint a1        | hash (LoadVoxels(a0,a1)) = 0w199 + ImageInfo.hash a0 + hashint a1
299        | hash (PosToImgSpace(a0)) = 0w211 + ImageInfo.hash a0        | hash (PosToImgSpace(a0)) = 0w211 + ImageInfo.hash a0
# Line 347  Line 347 
347        | toString (Trunc(a0)) = concat["Trunc<", intToString a0, ">"]        | toString (Trunc(a0)) = concat["Trunc<", intToString a0, ">"]
348        | toString IntToReal = "IntToReal"        | toString IntToReal = "IntToReal"
349        | toString (RealToInt(a0)) = concat["RealToInt<", intToString a0, ">"]        | toString (RealToInt(a0)) = concat["RealToInt<", intToString a0, ">"]
350        | toString RadiusQuery = "RadiusQuery"        | toString SphereQuery = "SphereQuery"
351        | toString (VoxelAddress(a0,a1)) = concat["VoxelAddress<", ImageInfo.toString a0, ",", intToString a1, ">"]        | toString (VoxelAddress(a0,a1)) = concat["VoxelAddress<", ImageInfo.toString a0, ",", intToString a1, ">"]
352        | toString (LoadVoxels(a0,a1)) = concat["LoadVoxels<", ImageInfo.toString a0, ",", intToString a1, ">"]        | toString (LoadVoxels(a0,a1)) = concat["LoadVoxels<", ImageInfo.toString a0, ",", intToString a1, ">"]
353        | toString (PosToImgSpace(a0)) = concat["PosToImgSpace<", ImageInfo.toString a0, ">"]        | toString (PosToImgSpace(a0)) = concat["PosToImgSpace<", ImageInfo.toString a0, ">"]

Legend:
Removed from v.2038  
changed lines
  Added in v.2039

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