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

SCM Repository

[diderot] Diff of /trunk/src/compiler/simplify/simplify.sml
ViewVC logotype

Diff of /trunk/src/compiler/simplify/simplify.sml

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

revision 197, Mon Aug 2 20:51:47 2010 UTC revision 229, Wed Aug 4 15:46:08 2010 UTC
# Line 24  Line 24 
24    (* make a block out of a list of statements that are in reverse order *)    (* make a block out of a list of statements that are in reverse order *)
25      fun mkBlock stms = S.Block(List.rev stms)      fun mkBlock stms = S.Block(List.rev stms)
26    
27      fun transform (AST.Program dcls) = let      fun simplifyProgram (AST.Program dcls) = let
28            val globals = ref []            val globals = ref []
29            val globalInit = ref []            val globalInit = ref []
30            val actors = ref []            val actors = ref []
31            fun simplifyDecl dcl = (case dcl            fun simplifyDecl dcl = (case dcl
32                   of AST.D_Input(x, NONE) => let                   of AST.D_Input(x, NONE) => let
33                        val t = newTemp Ty.T_String                        val e' = S.E_Input(Var.monoTypeOf x, Var.nameOf x, NONE)
                       val stm = S.S_Assign(t, S.E_Lit(Literal.String(Var.nameOf x)))  
                       val ty = Var.monoTypeOf x  
                       val e' = S.E_Apply(BasisVars.input,  
                               [Ty.TYPE(MetaVar.newFromType ty)], [t], ty)  
34                        in                        in
35                          globals := x :: !globals;                          globals := x :: !globals;
36                          globalInit := S.S_Assign(x, e') :: stm :: !globalInit                          globalInit := S.S_Assign(x, e') :: !globalInit
37                        end                        end
38                    | AST.D_Input(x, SOME e) => let                    | AST.D_Input(x, SOME e) => let
39                        val (stms, x') = simplifyExpToVar (e, [])                        val (stms, x') = simplifyExpToVar (e, [])
40                        val t = newTemp Ty.T_String                        val e' = S.E_Input(Var.monoTypeOf x, Var.nameOf x, SOME x')
                       val stm = S.S_Assign(t, S.E_Lit(Literal.String(Var.nameOf x)))  
                       val ty = Var.monoTypeOf x  
                       val e' = S.E_Apply(BasisVars.optInput,  
                               [Ty.TYPE(MetaVar.newFromType ty)], [t, x'], ty)  
41                        in                        in
42                          globals := x :: !globals;                          globals := x :: !globals;
43                          globalInit := S.S_Assign(x, e') :: stm :: (stms @ !globalInit)                          globalInit := S.S_Assign(x, e') :: (stms @ !globalInit)
44                        end                        end
45                    | AST.D_Var(AST.VD_Decl(x, e)) => let                    | AST.D_Var(AST.VD_Decl(x, e)) => let
46                        val (stms, e') = simplifyExp (e, [])                        val (stms, e') = simplifyExp (e, [])
# Line 64  Line 56 
56              List.app simplifyDecl dcls;              List.app simplifyDecl dcls;
57              S.Program{              S.Program{
58                  globals = List.rev(!globals),                  globals = List.rev(!globals),
59                    staticInit = mkBlock [],
60                  globalInit = mkBlock (!globalInit),                  globalInit = mkBlock (!globalInit),
61                  actors = List.rev(!actors)                  actors = List.rev(!actors)
62                }                }
# Line 191  Line 184 
184              f (exps, [], stms)              f (exps, [], stms)
185            end            end
186    
187        fun transform ast = let
188              val simple = simplifyProgram ast
189              val _ = SimplePP.output (TextIO.stdOut, simple)       (* DEBUG *)
190              val simple = Lift.transform simple
191              in
192                simple
193              end
194    
195    end    end

Legend:
Removed from v.197  
changed lines
  Added in v.229

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