Changeset 15297 for src/Pugs/CodeGen

Timestamp:

02/18/07 15:59:02 (21 months ago)

Author:

audreyt

Message:

* Revert the previous patch; everything back to normal.

Location:

src/Pugs/CodeGen

Files:

• JSON.hs (modified) (1 diff)
• PIL1.hs (modified) (1 diff)
• PIL2.hs (modified) (3 diffs)
• PIR.hs (modified) (4 diffs)
• Perl5.hs (modified) (1 diff)
• YAML.hs (modified) (2 diffs)

src/Pugs/CodeGen/JSON.hs

@@ -11 +11 @@
 genJSON = do
     penv <- compile () :: Eval PIL_Environment
-    return . _VStr . unlines $ [showJSON penv]
+    return . VStr . unlines $ [showJSON penv]

src/Pugs/CodeGen/PIL1.hs

@@ -10 +10 @@
 genPIL1 = do
     penv <- compile ()
-    return . _VStr . unlines $
+    return . VStr . unlines $
         [ "PIL_Environment"
         , "    { pilMain = (" ++ show (pilMain penv) ++ ")"

src/Pugs/CodeGen/PIL2.hs

@@ -17 +17 @@
 genPIL2 = do
     penv <- compile ()
-    return . _VStr . unlines $
+    return . VStr . unlines $
         [ "PIL_Environment"
         , "    { pilMain = (" ++ show (pilMain penv) ++ ")"
@@ -27 +27 @@
 genPIL2Perl5 = do
     penv <- compile () :: Eval PIL_Environment
-    return . _VStr . unlines $ [showPerl5 penv]
+    return . VStr . unlines $ [showPerl5 penv]
 
 genPIL2JSON :: Eval Val
 genPIL2JSON = do
     penv <- compile () :: Eval PIL_Environment
-    return . _VStr . unlines $ [showJSON penv]
+    return . VStr . unlines $ [showJSON penv]
 
 genPIL2YAML :: Eval Val
@@ -38 +38 @@
     penv <- compile () :: Eval PIL_Environment
     yaml <- liftIO (showYaml penv)
-    return . _VStr . unlines $ [yaml]
+    return . VStr . unlines $ [yaml]

src/Pugs/CodeGen/PIR.hs

@@ -162 +162 @@
 instance Translate PIL_Literal Expression where
     trans (PVal (VBool bool)) = return $ ExpLit (LitInt (toInteger $ fromEnum bool))
-    trans (PVal (VStr str)) = return $ ExpLit (LitStr (cast str))
+    trans (PVal (VStr str)) = return $ ExpLit (LitStr str)
     trans (PVal (VInt int)) = return $ ExpLit (LitInt int)
     trans (PVal (VNum num)) = return $ ExpLit (LitNum num)
@@ -168 +168 @@
     -- trans (PVal (VList [])) = return $ LitInt 0 -- XXX Wrong
     trans (PVal (VCode code))
-        | MkCode{ subBody = Syn syn [ Ann _ exp ] } <- code
-        , syn == cast "block" 
+        | MkCode{ subBody = Syn "block" [ Ann _ exp ] } <- code
         , App (Var var) Nothing [] <- exp
         = fmap ExpLV (trans (PVar $ cast var))
@@ -374 +373 @@
 genPIR_YAML = genPIRWith $ \globPIR mainPIR _ -> do
     yaml <- liftIO (showYaml (mainPIR, globPIR))
-    return (_VStr yaml)
+    return (VStr yaml)
 
 {-| Compiles the current environment to PIR code. -}
@@ -380 +379 @@
 genPIR = genPIRWith $ \globPIR mainPIR penv -> do
     libs        <- liftIO $ getLibs
-    return . _VStr . unlines $
+    return . VStr . unlines $
         [ "#!/usr/bin/env parrot"
         , renderStyle (Style PageMode 0 0) $ preludePIR $+$ vcat

src/Pugs/CodeGen/Perl5.hs

@@ -11 +11 @@
 genPerl5 = do
     penv <- compile () :: Eval PIL_Environment
-    return . _VStr . unlines $ [showPerl5 penv]
+    return . VStr . unlines $ [showPerl5 penv]

src/Pugs/CodeGen/YAML.hs

@@ -18 +18 @@
     main <- asks envBody
     yaml <- liftIO $ f $ mkCompUnit "<unused>" pad main
-    return $ _VStr yaml
+    return $ VStr yaml
 
 genYAML :: Eval Val
@@ -24 +24 @@
     penv <- compile () :: Eval PIL_Environment
     yaml <- liftIO (showYaml penv)
-    return $ _VStr yaml
+    return $ VStr yaml