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

SCM Repository

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

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

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

revision 2496, Tue Oct 29 05:29:46 2013 UTC revision 2497, Wed Oct 30 17:29:20 2013 UTC
# Line 39  Line 39 
39              | E.Delta(ix) =>  handleBeta ix              | E.Delta(ix) =>  handleBeta ix
40              | E.Value(ix)=> String.concat["_",Int.toString(ix),"_"]              | E.Value(ix)=> String.concat["_",Int.toString(ix),"_"]
41              | E.Epsilon(ix, jx, kx) => String.concat["E_",Int.toString(ix), Int.toString(jx), Int.toString(kx)]              | E.Epsilon(ix, jx, kx) => String.concat["E_",Int.toString(ix), Int.toString(jx), Int.toString(kx)]
42              | E.Sum (alpha,e1)=> String.concat["\n \t Sigma:", printAlpha alpha," (", printbody e1,")"]              | E.Sum (alpha,e1)=> String.concat["Σ_", printAlpha alpha," (", printbody e1,")"]
43              | E.Neg e1 => String.concat["-", printbody e1]              | E.Neg e1 => String.concat["-", printbody e1]
44              | E.Add el => String.concat["(",String.concatWith "+" (List.map printbody el),")"]              | E.Add el => String.concat["(",String.concatWith "+" (List.map printbody el),")"]
45              | E.Sub(e1, e2) => String.concat ["(",printbody(e1),"- ",printbody(e2), ")"]              | E.Sub(e1, e2) => String.concat ["(",printbody(e1),"- ",printbody(e2), ")"]
# Line 48  Line 48 
48              | E.Partial alpha => String.concat["d/dx_",printAlpha alpha]              | E.Partial alpha => String.concat["d/dx_",printAlpha alpha]
49              | E.Apply(e1, e2)=> String.concat [ printbody(e1),"@{", printbody(e2),"} "]              | E.Apply(e1, e2)=> String.concat [ printbody(e1),"@{", printbody(e2),"} "]
50    
51              | E.Conv(fid,alpha, tid ,[])=> String.concat["|V",Int.toString(fid),"_{",printAlpha alpha, "}★h|"]              | E.Conv(fid,alpha, tid ,[])=> String.concat["|V",Int.toString(fid),"_{",printAlpha alpha, "}★h",Int.toString(tid),"|"]
52              | E.Conv(fid,alpha, tid, beta)=> String.concat["|V",Int.toString(fid),"_{",printAlpha alpha, "}★d/dx_{",printAlpha beta,"}h|"]              | E.Conv(fid,alpha, tid, beta)=> String.concat["|V",Int.toString(fid),"_{",printAlpha alpha, "}★d/dx_{",printAlpha beta,"}h",Int.toString(tid),"|"]
53    
54              | E.Probe (e1,e2)=> String.concat ["",printbody(e1), "","[", printbody(e2),"]"]              | E.Probe (e1,e2)=> String.concat ["",printbody(e1), "","[", printbody(e2),"]"]
55              | E.Img (fid,alpha,pos)=> String.concat ["V", Int.toString(fid),"_",printAlpha alpha,"[",              | E.Img (fid,alpha,pos)=> String.concat ["V", Int.toString(fid),"_",printAlpha alpha,"[",
# Line 61  Line 61 
61          fun printerE (Ein.EIN{params, index, body}) = let          fun printerE (Ein.EIN{params, index, body}) = let
62          fun Index ((E.IX(dim))::i, count) = String.concat["(", Int.toString count,          fun Index ((E.IX(dim))::i, count) = String.concat["(", Int.toString count,
63                  " DIM:", Int.toString dim, ")", Index(i,count+1)]                  " DIM:", Int.toString dim, ")", Index(i,count+1)]
64              | Index ((E.SX(lb,ub))::i, count) = String.concat[ "} {Summation:(",Int.toString(count),              | Index ((E.SX(lb,ub))::i, count) = String.concat[ "} {Sum:(",Int.toString(count),
65                  " DIM:",Int.toString(lb),",", Int.toString(ub),")", Index(i,count+1)]                  " DIM:",Int.toString(lb),",", Int.toString(ub),")", Index(i,count+1)]
66              | Index (_, count) = ""              | Index (_, count) = ""
67          fun Param(E.TEN::param, i)=String.concat[Int.toString(i), ":TEN ", Param(param, i+1)]          fun Param(E.TEN::param, i)=String.concat[Int.toString(i), ":TEN ", Param(param, i+1)]
68              | Param(E.FLD(d)::param, i)= String.concat[Int.toString(i), ":FLD-", Int.toString d," ",Param(param, i+1)]              | Param(E.FLD(d)::param, i)= String.concat[Int.toString(i), ":FLD-", Int.toString d," ",Param(param, i+1)]
69              | Param(_,_)=""              | Param(_,_)=""
70    
71          val str=String.concat ["\n\t" ,Param(params, 0)," \n \t <",printbody(body),">","\n \t _{",Index(index,0),"} \n "]          val str=String.concat ["\n\t" ,Param(params, 0)," <",printbody(body),">"," _{",Index(index,0),"} \n "]
72          in          in
73              str              str
74          end          end

Legend:
Removed from v.2496  
changed lines
  Added in v.2497

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