CVS: sml-dist/src/compiler/FLINT/trans translate.sml, 1.33.4.27, 1.33.4.28

Update of /cvsroot/smlnj/sml-dist/src/compiler/FLINT/trans
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv9849/src/compiler/FLINT/trans

Modified Files:
      Tag: primop-branch-2
	translate.sml 
Log Message:
fixed parser2.sml problem

Index: translate.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/FLINT/trans/translate.sml,v
retrieving revision 1.33.4.27
retrieving revision 1.33.4.28
diff -C2 -d -r1.33.4.27 -r1.33.4.28
*** translate.sml	29 Aug 2006 14:05:14 -0000	1.33.4.27
--- translate.sml	29 Aug 2006 17:37:39 -0000	1.33.4.28
***************
*** 30,33 ****
--- 30,34 ----
        structure PO = PrimOp
        structure PP = PrettyPrintNew
+       structure PU = PPUtilNew
        structure S  = Symbol
        structure SP = SymPath
***************
*** 1051,1058 ****
  and mkVBs (vbs, d) =
    let fun mkVB (VB{pat=VARpat(V.VALvar{access=DA.LVAR v, ...}),
!                    exp as VARexp (ref (w as (V.VALvar{typ,prim,...})), instvs),
                     boundtvs=btvs, ...}, b: lexp) = 
              (* [dbm: 7/10/06] Originally, the mkVar and mkPE translations
!              * were chosen based on whether btvs and instvs were the same
               * list of tyvars, which would be the case for all non-primop
               * variables, but also in the primop case whenever the rhs
--- 1052,1059 ----
  and mkVBs (vbs, d) =
    let fun mkVB (VB{pat=VARpat(V.VALvar{access=DA.LVAR v, ...}),
!                    exp as VARexp (ref (w as (V.VALvar{typ,prim,...})), ptvs),
                     boundtvs=btvs, ...}, b: lexp) = 
              (* [dbm: 7/10/06] Originally, the mkVar and mkPE translations
!              * were chosen based on whether btvs and ptvs were the same
               * list of tyvars, which would be the case for all non-primop
               * variables, but also in the primop case whenever the rhs
***************
*** 1070,1074 ****
--- 1071,1078 ----
                          else LET(v, mkPE(exp, d, btvs), b)
                        | NONE => bug "mkVBs: unknown primop name")
+                | _ => LET(v, mkPE(exp, d, btvs), b))
+ (*
                 | _ => LET(v, mkVar(w, d), b))
+ *)
                   (* when generalized variables = instantiation params *)
  
***************
*** 1498,1502 ****
  val _ = if ltyerrors
          then (print "**** Translate: checkLty failed ****\n";
!               with_pp(fn ppstm => (PPLexp.ppLexp 25 ppstm plexp));
                complain EM.WARN "checkLty" EM.nullErrorBody)
          else print "**** Translate: finished typechecking plexp ****\n"
--- 1502,1511 ----
  val _ = if ltyerrors
          then (print "**** Translate: checkLty failed ****\n";
!               with_pp(fn str =>
!                 (PU.pps str "absyn:"; PP.newline str;
!                  ElabDebug.withInternals
!                   (fn () => PPAbsyn.ppDec (env,NONE) str (rootdec,1000)); PP.newline str;
!                  PU.pps str "lexp:"; PP.newline str;
!                  PPLexp.ppLexp 25 str plexp));
                complain EM.WARN "checkLty" EM.nullErrorBody)
          else print "**** Translate: finished typechecking plexp ****\n"


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642