Changeset 4974

Timestamp:

06/26/05 09:45:07 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

6771

Message:

* finish s/trans/codegen/

Files:

• Makefile.PL (modified) (5 diffs)
• src/Pugs/CodeGen.hs (modified) (3 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/Trans/PIR/Prelude.hs>;
+push @hsfiles, qw<src/Pugs/Config.hs src/Pugs/Prelude.hs src/Pugs/CodeGen/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/Trans/PIR/Prelude.hs',
+    'src/Pugs/Prelude.hs', 'src/Pugs/CodeGen/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/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
+src/Pugs/CodeGen/PIR/Prelude.hs : src/gen_prelude$Config{_exe} src/perl6/Prelude/PIR.pm
+        \@\$(PERL) -e "mkdir q-src/Pugs/CodeGen/PIR-"
+        src/gen_prelude$Config{_exe} Pugs.CodeGen.PIR.Prelude < src/perl6/Prelude/PIR.pm > src/Pugs/CodeGen/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/Trans/PIR/Prelude.hs @srcfiles $version_h @prereqs
+profiled :: src/Pugs/Config.hs src/Pugs/Prelude.hs src/Pugs/CodeGen/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/Trans/PIR/Prelude.hs @srcfiles $version_h @prereqs
+optimized :: src/Pugs/Config.hs src/Pugs/Prelude.hs src/Pugs/CodeGen/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/Trans/PIR/Prelude.hs @srcfiles $version_h @prereqs
+unoptimized :: src/Pugs/Config.hs src/Pugs/Prelude.hs src/Pugs/CodeGen/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/Trans/PIR/Prelude.hs @srcfiles $version_h @prereqs
+$pugs : src/Pugs/Config.hs src/Pugs/Prelude.hs src/Pugs/CodeGen/PIR/Prelude.hs @srcfiles $version_h @prereqs
         $ghc $threaded -O --make $ghc_flags $embed_flags $ccdlflags $ghc_output
 

src/Pugs/CodeGen.hs

@@ -15 +15 @@
 import qualified Data.Map as Map
 
-type Translator = Eval Val
+type Generator = Eval Val
 
-translators :: Map String Translator
-translators = Map.fromList $
+generators :: Map String Generator
+generators = Map.fromList $
     [ ("Ghc",         genGHC)
     , ("Parrot",      genPIR)
@@ -26 +26 @@
 
 backends :: [String]
-backends = Map.keys translators
+backends = Map.keys generators
 
 norm :: String -> String
@@ -33 +33 @@
           ucfirst [] = []
 
-doLookup :: String -> IO Translator
-doLookup s = Map.lookup (norm s) translators
+doLookup :: String -> IO Generator
+doLookup s = Map.lookup (norm s) generators
 
 translate :: String -> Env -> IO String