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

SCM Repository

[diderot] Diff of /branches/lamont/src/compiler/simplify/simple-pp.sml
ViewVC logotype

Diff of /branches/lamont/src/compiler/simplify/simple-pp.sml

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

revision 2245, Sun Mar 3 12:51:51 2013 UTC revision 2246, Sun Mar 3 14:51:31 2013 UTC
# Line 100  Line 100 
100                 var x; string "."; string (Atom.toString f); sp()  )                 var x; string "."; string (Atom.toString f); sp()  )
101            | S.E_StrandSet(sets,ty) => (            | S.E_StrandSet(sets,ty) => (
102                   string "{"; ppSets (ppStrm,sets); string "}")                   string "{"; ppSets (ppStrm,sets); string "}")
103            | S.E_Reduction(r,sv,xExp,ty) =>            | S.E_Reduction(r,sv,_,xExp,ty) =>
104                  (string (reductionToString(r)); string "{"; sp(); var xExp; string "}"; sp())                  (string (reductionToString(r)); string "{"; sp(); var xExp; string "}"; sp())
105                    | S.E_Tuple es => ppArgs (ppStrm, es)                    | S.E_Tuple es => ppArgs (ppStrm, es)
106                    | S.E_Apply(f, [], args, _) => (var f; sp(); ppArgs (ppStrm, args))                    | S.E_Apply(f, [], args, _) => (var f; sp(); ppArgs (ppStrm, args))
# Line 298  Line 298 
298              pp              pp
299            end            end
300    
301      fun output (outS, S.Program{inputs, globals, globalInit, globalBlock, strands, init,...}) = let      fun output (outS, S.Program{inputs, globals, globalInit, globalReduce, globalBlock, strands, init,...}) = let
302            val ppStrm = PP.openOut {dst = outS, wid = 120}            val ppStrm = PP.openOut {dst = outS, wid = 120}
303            fun nl () = PP.newline ppStrm            fun nl () = PP.newline ppStrm
304            in            in
# Line 310  Line 310 
310                PP.string ppStrm "(*** Global Block ***)"; nl();                PP.string ppStrm "(*** Global Block ***)"; nl();
311            ppBlock (ppStrm, [], globalBlock);            ppBlock (ppStrm, [], globalBlock);
312                nl();                nl();
313                  PP.string ppStrm "(*** Global Reduce ***)"; nl();
314              ppBlock (ppStrm, [], globalReduce);
315                  nl();
316                ppInit (ppStrm, init);                ppInit (ppStrm, init);
317                List.app (ppStrand ppStrm) strands;                List.app (ppStrand ppStrm) strands;
318                PP.string ppStrm "/* Program end */"; PP.newline ppStrm;                PP.string ppStrm "/* Program end */"; PP.newline ppStrm;

Legend:
Removed from v.2245  
changed lines
  Added in v.2246

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