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

SCM Repository

[diderot] Diff of /branches/charisee_dev/src/compiler/ein/printer.sml
ViewVC logotype

Diff of /branches/charisee_dev/src/compiler/ein/printer.sml

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

revision 3033, Tue Mar 10 15:17:25 2015 UTC revision 3138, Thu Mar 26 16:27:35 2015 UTC
# Line 31  Line 31 
31          | E.Value(ix)=> String.concat["_",iTos(ix),"_"]          | E.Value(ix)=> String.concat["_",iTos(ix),"_"]
32          | E.Epsilon(ix, jx, kx) => String.concat["ϵ_",iTos(ix), iTos(jx), iTos(kx)]          | E.Epsilon(ix, jx, kx) => String.concat["ϵ_",iTos(ix), iTos(jx), iTos(kx)]
33          | E.Eps2(ix, jx) => String.concat["ϵ_",iTos(ix), iTos(jx)]          | E.Eps2(ix, jx) => String.concat["ϵ_",iTos(ix), iTos(jx)]
  (*  
  | E.Sum(_,e1 as E.Add _)=>String.concat[" Σ_Add","⋐" ,printbody e1,"⋑"]  
  | E.Sum(_,e1 as E.Sub _)=>String.concat[" Σ_sub","⋐" ,printbody e1,"⋑"]  
   | E.Sum(_,e1 as E.Prod _)=>String.concat[" Σ_prod","⋐" ,printbody e1,"⋑"]  
   | E.Sum(_,e1 as E.Neg _)=>String.concat[" Σ_neg","⋐" ,printbody e1,"⋑"]  
   | E.Sum(_,e1 as E.Sqrt _)=>String.concat[" Σ_sqrt","⋐" ,printbody e1,"⋑"]  
  *)  
34          | E.Sum ([(v,_,_)],e1)=>String.concat[" Σ_",handleIndex v,"⋐" ,printbody e1,"⋑",handleIndex v]          | E.Sum ([(v,_,_)],e1)=>String.concat[" Σ_",handleIndex v,"⋐" ,printbody e1,"⋑",handleIndex v]
   
35          | E.Sum (sumindex,e1)=>String.concat[" Σ_",String.concatWith ","(List.map handleSumRange sumindex),"⋐" ,printbody e1,"⋑"]          | E.Sum (sumindex,e1)=>String.concat[" Σ_",String.concatWith ","(List.map handleSumRange sumindex),"⋐" ,printbody e1,"⋑"]
36          | E.Neg e1 => String.concat["-NEG-", printbody e1]          | E.Neg e1 => String.concat["-NEG-", printbody e1]
37          | E.Lift e1 => String.concat["LIFT ⊢", printbody e1,"⊣"]          | E.Lift e1 => String.concat["LIFT ⊢", printbody e1,"⊣"]
# Line 49  Line 41 
41          | E.Div(e1,e2) => String.concat ["(",printbody(e1),")/( ",printbody (e2),")"]          | E.Div(e1,e2) => String.concat ["(",printbody(e1),")/( ",printbody (e2),")"]
42          | E.Partial alpha => String.concat["d/dx_",handleAlpha alpha]          | E.Partial alpha => String.concat["d/dx_",handleAlpha alpha]
43          | E.Apply(e1, e2)=> String.concat [ printbody(e1),"@{", printbody(e2),"} "]          | E.Apply(e1, e2)=> String.concat [ printbody(e1),"@{", printbody(e2),"} "]
   
44          | E.Conv(fid,alpha, tid ,[])=> String.concat["|v",iTos(fid),"_{",handleAlpha alpha, "}★h",iTos(tid),"|"]          | E.Conv(fid,alpha, tid ,[])=> String.concat["|v",iTos(fid),"_{",handleAlpha alpha, "}★h",iTos(tid),"|"]
45          | E.Conv(fid,alpha, tid, beta)=> String.concat["|v",iTos(fid),"_{",handleAlpha alpha, "}★d/dx_{",handleAlpha beta,"}h",iTos(tid),"|"]          | E.Conv(fid,alpha, tid, beta)=> String.concat["|v",iTos(fid),"_{",handleAlpha alpha, "}★d/dx_{",handleAlpha beta,"}h",iTos(tid),"|"]
  (*  
         | E.Conv(fid,alpha, tid, beta)=> String.concat["F_",handleAlpha alpha, "★",handleAlpha beta]  
        (* | E.Conv _ =>String.concat["G"]*)  
         | E.Probe(e1,_)=>printbody(e1)*)  
46          | E.Probe (e1,e2)=> String.concat ["[",printbody(e1), "","[", printbody(e2),"]]"]          | E.Probe (e1,e2)=> String.concat ["[",printbody(e1), "","[", printbody(e2),"]]"]
47          | E.Img (fid,alpha,pos)=> String.concat [" V", iTos(fid),"_",handleAlpha alpha,"[",          | E.Img (fid,alpha,pos)=> String.concat [" V", iTos(fid),"_",handleAlpha alpha,"[",
48                  (String.concatWith "," (List.map printbody pos)),"]"]                  (String.concatWith "," (List.map printbody pos)),"]"]
   
49            | E.Sqrt e => String.concat[ "√(", printbody e ,")"]            | E.Sqrt e => String.concat[ "√(", printbody e ,")"]
50          | E.PowInt(e,n1) => String.concat[  "(",printbody e ,")^",iTos n1]          | E.PowInt(e,n1) => String.concat[  "(",printbody e ,")^",iTos n1]
51          | E.PowReal(e,n1) => String.concat[ "(", printbody e ,")^",RationalEin.toString n1]          | E.PowReal(e,n1) => String.concat[ "(", printbody e ,")^",RationalEin.toString n1]
52            | E.Cosine e=>  String.concat["Cosine(",printbody e ,")"]
53            | E.ArcCosine e=> String.concat["ArcCosine(",printbody e ,")"]
54            | E.Sine e => String.concat["Sine(",printbody e ,")"]
55            | E.ArcSine e => String.concat["ArcSine(",printbody e ,")"]
56          (* end case *))          (* end case *))
57    
58      (*printerE:EIN ->string*)      (*printerE:EIN ->string*)

Legend:
Removed from v.3033  
changed lines
  Added in v.3138

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