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

SCM Repository

[diderot] Diff of /trunk/src/compiler/basis/basis-vars.sml
ViewVC logotype

Diff of /trunk/src/compiler/basis/basis-vars.sml

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

revision 3112, Wed Mar 18 19:28:13 2015 UTC revision 3113, Thu Mar 19 08:40:49 2015 UTC
# Line 70  Line 70 
70              in              in
71                [f, f] --> f                [f, f] --> f
72              end))              end))
73      val add_ft = polyVar(N.op_add, all([DK,NK], (* field + scalar *)      val add_fr = polyVar(N.op_add, all([DK,NK], (* field + scalar *)
74            fn [Ty.DIFF k, Ty.DIM d] => let            fn [Ty.DIFF k, Ty.DIM d] => let
75              val f = Ty.T_Field{diff = Ty.DiffVar(k, 0), dim = Ty.DimVar d, shape = Ty.ShapeVar[]}              val f = Ty.T_Field{diff = Ty.DiffVar(k, 0), dim = Ty.DimVar d, shape = Ty.Shape[]}
             val t = Ty.T_Tensor(Ty.ShapeVar dd)  
76              in              in
77                [f, t] --> f                [f, Ty.realTy] --> f
78              end))              end))
79      val add_tf = polyVar(N.op_add, all([DK,NK], (* scalar + field *)      val add_rf = polyVar(N.op_add, all([DK,NK], (* scalar + field *)
80            fn [Ty.DIFF k, Ty.DIM d] => let            fn [Ty.DIFF k, Ty.DIM d] => let
81              val f = Ty.T_Field{diff = Ty.DiffVar(k, 0), dim = Ty.DimVar d, shape = Ty.ShapeVar[]}              val f = Ty.T_Field{diff = Ty.DiffVar(k, 0), dim = Ty.DimVar d, shape = Ty.Shape[]}
             val t = Ty.T_Tensor(Ty.ShapeVar dd)  
82              in              in
83                [t, f] --> f                [Ty.realTy, f] --> f
84              end))              end))
85    
86      val sub_ii = monoVar(N.op_sub, [Ty.T_Int, Ty.T_Int] --> Ty.T_Int)      val sub_ii = monoVar(N.op_sub, [Ty.T_Int, Ty.T_Int] --> Ty.T_Int)

Legend:
Removed from v.3112  
changed lines
  Added in v.3113

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