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

SCM Repository

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

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

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

revision 2164, Fri Feb 22 22:44:05 2013 UTC revision 2165, Fri Feb 22 22:44:32 2013 UTC
# Line 108  Line 108 
108        | ScaleField        | ScaleField
109        | NegField        | NegField
110        | DiffField        | DiffField
111          | CurlField of int
112        | LoadSeq of ty * string        | LoadSeq of ty * string
113        | LoadImage of ty * string * ImageInfo.info        | LoadImage of ty * string * ImageInfo.info
114        | Input of input        | Input of input
# Line 172  Line 173 
173        | resultArity ScaleField = 1        | resultArity ScaleField = 1
174        | resultArity NegField = 1        | resultArity NegField = 1
175        | resultArity DiffField = 1        | resultArity DiffField = 1
176          | resultArity (CurlField _) = 1
177        | resultArity (LoadSeq _) = 1        | resultArity (LoadSeq _) = 1
178        | resultArity (LoadImage _) = 1        | resultArity (LoadImage _) = 1
179        | resultArity (Input _) = 0        | resultArity (Input _) = 0
# Line 236  Line 238 
238        | arity ScaleField = 2        | arity ScaleField = 2
239        | arity NegField = 1        | arity NegField = 1
240        | arity DiffField = 1        | arity DiffField = 1
241          | arity (CurlField _) = 1
242        | arity (LoadSeq _) = 0        | arity (LoadSeq _) = 0
243        | arity (LoadImage _) = 0        | arity (LoadImage _) = 0
244        | arity (Input _) = 0        | arity (Input _) = 0
# Line 300  Line 303 
303        | same (ScaleField, ScaleField) = true        | same (ScaleField, ScaleField) = true
304        | same (NegField, NegField) = true        | same (NegField, NegField) = true
305        | same (DiffField, DiffField) = true        | same (DiffField, DiffField) = true
306          | same (CurlField(a0), CurlField(b0)) = sameint(a0, b0)
307        | 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)
308        | same (LoadImage(a0,a1,a2), LoadImage(b0,b1,b2)) = samety(a0, b0) andalso samestring(a1, b1) andalso ImageInfo.same(a2, b2)        | same (LoadImage(a0,a1,a2), LoadImage(b0,b1,b2)) = samety(a0, b0) andalso samestring(a1, b1) andalso ImageInfo.same(a2, b2)
309        | same (Input(a0), Input(b0)) = sameinput(a0, b0)        | same (Input(a0), Input(b0)) = sameinput(a0, b0)
# Line 365  Line 369 
369        | hash ScaleField = 0w271        | hash ScaleField = 0w271
370        | hash NegField = 0w277        | hash NegField = 0w277
371        | hash DiffField = 0w281        | hash DiffField = 0w281
372        | hash (LoadSeq(a0,a1)) = 0w283 + hashty a0 + hashstring a1        | hash (CurlField(a0)) = 0w283 + hashint a0
373        | hash (LoadImage(a0,a1,a2)) = 0w293 + hashty a0 + hashstring a1 + ImageInfo.hash a2        | hash (LoadSeq(a0,a1)) = 0w293 + hashty a0 + hashstring a1
374        | hash (Input(a0)) = 0w307 + hashinput a0        | hash (LoadImage(a0,a1,a2)) = 0w307 + hashty a0 + hashstring a1 + ImageInfo.hash a2
375        | hash (Print(a0)) = 0w311 + hashtys a0        | hash (Input(a0)) = 0w311 + hashinput a0
376          | hash (Print(a0)) = 0w313 + hashtys a0
377    
378      fun toString (Add(a0)) = concat["Add<", tyToString a0, ">"]      fun toString (Add(a0)) = concat["Add<", tyToString a0, ">"]
379        | toString (Sub(a0)) = concat["Sub<", tyToString a0, ">"]        | toString (Sub(a0)) = concat["Sub<", tyToString a0, ">"]
# Line 429  Line 434 
434        | toString ScaleField = "ScaleField"        | toString ScaleField = "ScaleField"
435        | toString NegField = "NegField"        | toString NegField = "NegField"
436        | toString DiffField = "DiffField"        | toString DiffField = "DiffField"
437          | toString (CurlField(a0)) = concat["CurlField<", intToString a0, ">"]
438        | toString (LoadSeq(a0,a1)) = concat["LoadSeq<", tyToString a0, ",", stringToString a1, ">"]        | toString (LoadSeq(a0,a1)) = concat["LoadSeq<", tyToString a0, ",", stringToString a1, ">"]
439        | toString (LoadImage(a0,a1,a2)) = concat["LoadImage<", tyToString a0, ",", stringToString a1, ",", ImageInfo.toString a2, ">"]        | toString (LoadImage(a0,a1,a2)) = concat["LoadImage<", tyToString a0, ",", stringToString a1, ",", ImageInfo.toString a2, ">"]
440        | toString (Input(a0)) = concat["Input<", inputToString a0, ">"]        | toString (Input(a0)) = concat["Input<", inputToString a0, ">"]

Legend:
Removed from v.2164  
changed lines
  Added in v.2165

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