Changeset 7867

Timestamp:

11/06/05 01:46:36 (3 years ago)

Author:

autrijus

Message:

* ./pugs -C Perl5 (and -C JSON, -C Binary) are deprecated.

Use "-C PIL1-Perl5" instead; it doesn't have to be a dash;
any nonalphanumerical character would do:

./pugs -CPIL1.Perl5 -e 'say 123'

This is because "-C Perl5" will be reserved to mean the
backend that actually compiles to Perl 5.

Files:

• perl5/PIL-Run/lib/PIL/Run/EvalX.pm (modified) (2 diffs)
• perl5/PIL2JS/README (modified) (4 diffs)
• perl5/PIL2JS/lib/PIL/Parser.pm (modified) (2 diffs)
• perl5/PIL2JS/lib/PIL2JS.pm (modified) (4 diffs)
• perl5/PIL2JS/pil2js.pl (modified) (1 diff)
• src/Pugs.hs (modified) (1 diff)
• src/Pugs/CodeGen.hs (modified) (2 diffs)

perl5/PIL-Run/lib/PIL/Run/EvalX.pm

@@ -289 +289 @@
     }
     my $extra_args = $main::pugs_args ? $main::pugs_args : ""; #XXX- kludge
-    my $cmd = "$pugs $extra_args $dir -CPerl5 $fn";
+    my $cmd = "$pugs $extra_args $dir -CPIL1-Perl5 $fn";
     my $pil = `$cmd`; #die if $!;
     unlink $fn or die "Couldn't remove \"$fn\": $!\n";
@@ -306 +306 @@
     my($pil)=@_;
     my $pilc = eval($pil);
-    die "Eval of -CPerl5 code failed. $@" if $@;
+    die "Eval of -CPIL1-Perl5 code failed. $@" if $@;
     $pilc;
 }

perl5/PIL2JS/README

@@ -6 +6 @@
 
 C<pil2js.pl> is a Perl 5 program which takes PIL as input (as given by C<pugs
--CPerl5>) and outputs JavaScript.
+-CPIL1-Perl5>) and outputs JavaScript.
 
 =head1 USAGE
@@ -49 +49 @@
   |   |-- PIL.pm          Main compiler modules, uses all other PIL:: modules
   |   |-- PIL
-  |   |   |-- Parser.pm   PIL::Parser (parses the output of -CPerl5)
+  |   |   |-- Parser.pm   PIL::Parser (parses the output of -CPIL1-Perl5)
   |   |   `-- <PIL nodetype>.pm
   |   |                   Backend compiler modules
@@ -440 +440 @@
 
   # Compile the Perl 6 to PIL
-  $ pugs -CPerl5 -we '
+  $ pugs -CPIL1-Perl5 -we '
       $*JS::JSAN.addRepository("/tmp/jsanlibs");
       use jsan:Number.Roman <to_roman>;
@@ -568 +568 @@
 =item *
 
-Don't call all subs in list context -- but to fix this reliably, C<-CPerl5> has
+Don't call all subs in list context -- but to fix this reliably, C<-CPIL1-Perl5> has
 to give better context information.
 

perl5/PIL2JS/lib/PIL/Parser.pm

@@ -1 +1 @@
 package PIL::Parser;
-# This module takes the output of pugs -CPerl5, eval()s it, and reblesses most
+# This module takes the output of pugs -CPIL1-Perl5, eval()s it, and reblesses most
 # objects (we want PIL::PVal, not PVal).
 
@@ -20 +20 @@
 
   my $struct = eval $str;
-  die "Couldn't parse -CPerl5 output: $@\n" if $@;
+  die "Couldn't parse -CPIL1-Perl5 output: $@\n" if $@;
   Class::Rebless->custom($struct, "PIL", { editor => sub {
     my ($obj, $namespace) = @_;

perl5/PIL2JS/lib/PIL2JS.pm

@@ -66 +66 @@
   preludepc_check();
 
-  my $pil  = run_pugs("-CPerl5", @_);
+  my $pil  = run_pugs("-CPIL1-Perl5", @_);
   die "Error: Couldn't compile to PIL!\n" if not defined $pil;
   my $mini = run_pil2js(\$pil);
@@ -75 +75 @@
 
 sub compile_perl6_to_mini_js {
-  my $pil = run_pugs("-CPerl5", @_);
+  my $pil = run_pugs("-CPIL1-Perl5", @_);
   die "Error: Couldn't compile to PIL!\n" if not defined $pil;
 
@@ -95 +95 @@
 
 sub precomp_module_to_mini_js {
-  my $pil = eval { run_pugs("-CPerl5", @_, "-e", "''") };
+  my $pil = eval { run_pugs("-CPIL1-Perl5", @_, "-e", "''") };
   die $@ if $@;
   my $js  = eval { run_pil2js("-v", \$pil) };
@@ -103 +103 @@
 
 sub compile_perl6_to_pil {
-  my $pil = run_pugs("-CPerl5", @_);
+  my $pil = run_pugs("-CPIL1-Perl5", @_);
   die "Error: Couldn't compile to PIL!\n" if not defined $pil;
   return $pil;

perl5/PIL2JS/pil2js.pl

@@ -56 +56 @@
 
   my $pil  = $input[0] =~ /\.(?:pl|p6|pm|p6m|t)$/i
-    ? decode "utf-8", run_pugs("-CPerl5", $input[0])
+    ? decode "utf-8", run_pugs("-CPIL1-Perl5", $input[0])
     : slurp $input[0];
   my $tree = PIL::Parser->parse($pil);

src/Pugs.hs

@@ -78 +78 @@
 run ("-c":file:_)               = readFile file >>= doCheck file
 
--- -CPerl5 outputs PIL formatted as Perl 5, PIL-Run is not involved.
--- Should we rename -CPerl5, -CJSON etc. to -CPIL.Perl5, -CPIL.JSON etc.?
+-- -CPIL1.Perl5 outputs PIL formatted as Perl 5.
 run ("-C":backend:args) | map toUpper backend == "JS" = do
     exec <- getArg0

src/Pugs/CodeGen.hs

@@ -29 +29 @@
 generators = Map.fromList $
     [ ("GHC",         genGHC)
-    , ("Parrot",      genPIR)
     , ("PIR",         genPIR)
     , ("PIL1",        genPIL1)
+    , ("PIL1-Perl5",  genPerl5)
+    , ("PIL1-Binary", genBinary)
+    , ("PIL1-JSON",   genJSON)
     , ("PIL2",        genPIL2)
     , ("PIL2-Perl5",  genPIL2Perl5)
     , ("PIL2-JSON",   genPIL2JSON)
     , ("PIL2-Binary", genPIL2Binary)
-    , ("Perl5",       genPerl5)
     , ("Pugs",        genPugs)
-    , ("Binary",      genBinary)
-    , ("JSON",        genJSON)
 --  , ("XML",         genXML)
     ]
@@ -50 +49 @@
     where
     norm' "ghc"    = "GHC"
-    norm' "parrot" = "Parrot"
+    norm' "parrot" = "!PIR"
     norm' "pir"    = "PIR"
-    norm' "pil"    = "PIL1" -- XXX - this will change
+    norm' "pil"    = "!PIL1"
     norm' "pil1"   = "PIL1"
     norm' "pil2"   = "PIL2"
-    norm' "perl5"  = "Perl5"
+    norm' "perl5"  = "!PIL1-Perl5"
+    norm' "binary" = "!PIL1-Binary"
+    norm' "json"   = "!PIL1-JSON"
+    norm' "pil1perl5"  = "PIL1-Perl5"
+    norm' "pil1json"   = "PIL1-JSON"
+    norm' "pil1binary" = "PIL1-Binary"
     norm' "pil2perl5"  = "PIL2-Perl5"
     norm' "pil2json"   = "PIL2-JSON"
     norm' "pil2binary" = "PIL2-Binary"
     norm' "pugs"   = "Pugs"
-    norm' "binary" = "Binary"
-    norm' "json"   = "JSON"
     -- norm' "xml"    = "XML"
     norm' x        = x
 
 doLookup :: String -> IO Generator
-doLookup s = Map.lookup (norm s) generators
+doLookup s = do
+    case norm s of
+        ('!':key) -> do
+            putStrLn $ "*** The backend '" ++ s ++ "' is deprecated."
+            putStrLn $ "    Please use '" ++ key ++ "' instead."
+            Map.lookup key generators
+        key -> Map.lookup key generators
 
 codeGen :: String -> Env -> IO String