Changeset 4916

Timestamp:

06/22/05 21:33:15 (4 years ago)

Author:

bsmith

svk:copy_cache_prev:

6771

Message:

Moved Pugs.Compile.PIR to Pugs.Trans.PIR

Files:

• Makefile.PL (modified) (5 diffs)
• src/Pugs/Compile.hs (modified) (1 diff)
• src/Pugs/Trans (modified) (1 prop)
• src/Pugs/Trans.hs (modified) (1 diff)
• src/Pugs/Trans/PIR.hs (moved) (moved from src/Pugs/Compile/PIR.hs) (4 diffs)

Makefile.PL

@@ -13 +13 @@
 my @srcdirs  = grep {-d} glob("src"), glob("src/*"), glob("src/*/*"), glob("src/*/*/*");
 my @hsfiles  = map {glob "$_/*.hs"} @srcdirs;
-push @hsfiles, qw<src/Pugs/Config.hs src/Pugs/Prelude.hs src/Pugs/Compile/PIR/Prelude.hs>;
+push @hsfiles, qw<src/Pugs/Config.hs src/Pugs/Prelude.hs src/Pugs/Trans/PIR/Prelude.hs>;
 my @hppfiles = map {my $x=$_; $x=~s/\.hs$/.hpp/; $x} @hsfiles;
 
@@ -47 +47 @@
     "pugs*", "src/Pugs/pugs_config.h", $version_h, $config_h,
     'src/Pugs/Config.hs', 'blib6',
-    'src/Pugs/Prelude.hs', 'src/Pugs/Compile/PIR/Prelude.hs',
+    'src/Pugs/Prelude.hs', 'src/Pugs/Trans/PIR/Prelude.hs',
     "src/gen_prelude$Config{_exe}",
     'test.log',
@@ -247 +247 @@
         src/gen_prelude$Config{_exe} Pugs.Prelude < src/perl6/Prelude.pm > src/Pugs/Prelude.hs
 
-src/Pugs/Compile/PIR/Prelude.hs : src/gen_prelude$Config{_exe} src/perl6/Prelude/PIR.pm
-        \@\$(PERL) -e "mkdir q-src/Pugs/Compile/PIR-"
-        src/gen_prelude$Config{_exe} Pugs.Compile.PIR.Prelude < src/perl6/Prelude/PIR.pm > src/Pugs/Compile/PIR/Prelude.hs
+src/Pugs/Trans/PIR/Prelude.hs : src/gen_prelude$Config{_exe} src/perl6/Prelude/PIR.pm
+        \@\$(PERL) -e "mkdir q-src/Pugs/Trans/PIR-"
+        src/gen_prelude$Config{_exe} Pugs.Trans.PIR.Prelude < src/perl6/Prelude/PIR.pm > src/Pugs/Trans/PIR/Prelude.hs
 
 ${() = '%.hpp : %.hs @prereqs $version_h
@@ -274 +274 @@
         \@\$(PERL) -e "mkdir q-docs/haddock-"
 
-profiled :: src/Pugs/Config.hs src/Pugs/Prelude.hs src/Pugs/Compile/PIR/Prelude.hs @srcfiles $version_h @prereqs
+profiled :: src/Pugs/Config.hs src/Pugs/Prelude.hs src/Pugs/Trans/PIR/Prelude.hs @srcfiles $version_h @prereqs
         $ghc $threaded -O -auto-all -prof --make $profiled_flags $ccdlflags $ghc_output
 
@@ -282 +282 @@
 optimised :: optimized
 
-optimized :: src/Pugs/Config.hs src/Pugs/Prelude.hs src/Pugs/Compile/PIR/Prelude.hs @srcfiles $version_h @prereqs
+optimized :: src/Pugs/Config.hs src/Pugs/Prelude.hs src/Pugs/Trans/PIR/Prelude.hs @srcfiles $version_h @prereqs
         $ghc $threaded -O --make $ghc_flags $embed_flags $ccdlflags $ghc_output
 
 unoptimised :: unoptimized
 
-unoptimized :: src/Pugs/Config.hs src/Pugs/Prelude.hs src/Pugs/Compile/PIR/Prelude.hs @srcfiles $version_h @prereqs
+unoptimized :: src/Pugs/Config.hs src/Pugs/Prelude.hs src/Pugs/Trans/PIR/Prelude.hs @srcfiles $version_h @prereqs
         $ghc $threaded -O0 --make $ghc_flags $embed_flags $ccdlflags $ghc_output
 
-$pugs : src/Pugs/Config.hs src/Pugs/Prelude.hs src/Pugs/Compile/PIR/Prelude.hs @srcfiles $version_h @prereqs
+$pugs : src/Pugs/Config.hs src/Pugs/Prelude.hs src/Pugs/Trans/PIR/Prelude.hs @srcfiles $version_h @prereqs
         $ghc $threaded -O --make $ghc_flags $embed_flags $ccdlflags $ghc_output
 

src/Pugs/Compile.hs

@@ -441 +441 @@
     in Just (pkg, name')
 isQualified _ = Nothing
+
+initTEnv :: Eval TEnv
+initTEnv = do
+    initReg <- liftSTM $ newTVar (0, "")
+    initLbl <- liftSTM $ newTVar 0
+    return $ MkTEnv
+        { tLexDepth = 0
+        , tTokDepth = 0
+        , tCxt      = tcVoid
+        , tReg      = initReg
+        , tLabel    = initLbl
+        }
+

src/Pugs/Trans.hs

@@ -10 +10 @@
 import Pugs.AST
 import Pugs.Internals
-import Pugs.Compile.PIR (genPIR)
+import Pugs.Trans.PIR (genPIR)
 import Pugs.Compile.Pugs (genPugs)
 import Pugs.Compile.Haskell (genGHC)

src/Pugs/Trans/PIR.hs

@@ -14 +14 @@
 -}
 
-module Pugs.Compile.PIR (genPIR) where
+module Pugs.Trans.PIR (genPIR) where
 import Pugs.Internals
 import Pugs.AST
@@ -22 +22 @@
 import Pugs.Pretty
 import Text.PrettyPrint
-import Pugs.Compile.PIR.Prelude (preludeStr)
+import Pugs.Trans.PIR.Prelude (preludeStr)
 import Pugs.Prim.Eval
 import Pugs.Compile
@@ -114 +114 @@
         rhsC    <- trans rhs
         return $ lhsC `KEYED` rhsC
-    trans (PApp cxt fun args) = do
+    trans (PApp _ fun args) = do
         funC    <- trans fun {- case fun of
             PExp (PVar name) -> return $ lit name
@@ -389 +389 @@
 runTrans :: (Translate a b) => TEnv -> a -> Eval (b, [Stmt])
 runTrans tenv = liftIO . (`runReaderT` tenv) . runWriterT . trans
-
-initTEnv :: Eval TEnv
-initTEnv = do
-    initReg <- liftSTM $ newTVar (0, "")
-    initLbl <- liftSTM $ newTVar 0
-    return $ MkTEnv
-        { tLexDepth = 0
-        , tTokDepth = 0
-        , tCxt      = tcVoid
-        , tReg      = initReg
-        , tLabel    = initLbl
-        }
-