Changeset 7127

Timestamp:

09/24/05 15:28:50 (3 years ago)

Author:

iblech

Message:

* Usual svn props.
* PIL2JS: runjs.pl: Added --compile-only option, needed for new -CJS.
* Main: Added support for -CJS and unbroke -CPIR.
* Pugs.CodeGen?: Better normalization so -h looks prettier (it's "PIL", not

"Pil", for example).

* Pugs.Help: Add JS to the list of backends supported.
* pugs::hack: Accomodate for the above changes.

Files:

• docs/journal/2005-09-22.kwid (modified) (2 props)
• docs/notes/theory.pod (modified) (2 props)
• lib/pugs/run.pod (modified) (1 diff)
• perl5/PIL2JS/runjs.pl (modified) (3 diffs)
• perl5/Perl6-MetaModel2.0/ext/Test-Builder/lib/TestBuilder.pm (modified) (2 props)
• perl5/Perl6-MetaModel2.0/ext/Test-Builder/lib/TestBuilder/Output.pm (modified) (2 props)
• perl5/Perl6-MetaModel2.0/ext/Test-Builder/lib/TestBuilder/Test.pm (modified) (2 props)
• perl5/Perl6-MetaModel2.0/ext/Test-Builder/lib/TestBuilder/TestPlan.pm (modified) (2 props)
• perl5/Perl6-MetaModel2.0/ext/Test-Builder/lib/TestBuilder/Tester.pm (modified) (2 props)
• perl5/Perl6-MetaModel2.0/ext/Test-Builder/t/001_load.t (modified) (2 props)
• perl5/Perl6-MetaModel2.0/ext/Test-Builder/t/010_Test_Builder.t (modified) (2 props)
• perl5/Perl6-MetaModel2.0/ext/Test-Builder/t/020_Test_Builder_Test.t (modified) (2 props)
• perl5/Perl6-MetaModel2.0/ext/Test-Builder/t/021_Test_Builder_Test_Pass.t (modified) (2 props)
• perl5/Perl6-MetaModel2.0/ext/Test-Builder/t/022_Test_Builder_Test_Fail.t (modified) (2 props)
• perl5/Perl6-MetaModel2.0/ext/Test-Builder/t/023_Test_Builder_Test_Skip.t (modified) (2 props)
• perl5/Perl6-MetaModel2.0/ext/Test-Builder/t/024_Test_Builder_Test_TODO.t (modified) (2 props)
• perl5/Perl6-MetaModel2.0/ext/Test-Builder/t/030_Test_Builder_Output.t (modified) (2 props)
• perl5/Perl6-MetaModel2.0/ext/Test-Builder/t/040_Test_Builder_TestPlan.t (modified) (2 props)
• perl5/Perl6-MetaModel2.0/ext/Test-Builder/t/050_Test_Builder_Tester.t (modified) (2 props)
• perl5/Perl6-MetaModel2.0/t/33_BUILD.t (modified) (2 props)
• perl5/Perl6-MetaModel2.0/t/34_nested_parameterized_classes.t (modified) (2 props)
• src/Main.hs (modified) (1 diff)
• src/Pugs/CodeGen.hs (modified) (2 diffs)
• src/Pugs/Help.hs (modified) (2 diffs)

lib/pugs/run.pod

@@ -70 +70 @@
 
 causes Pugs to execute the program using C<I<backend>>. Currently, valid
-backends are C<Parrot> and C<PIR>.
-
-The JavaScript backend (PIL2JS) provides an interactive shell in
-F<perl5/PIL2JS/jspugs.pl>; The interactive compiler and evaluator of the Perl 5
-backend (PIL-Run) can be found in F<perl5/PIL-Run/crude_repl.pl>.
+backends are C<Parrot>, C<PIR>, C<Perl5>, and C<JS>.
+
+To start the interactive shell of a backend, run C<pugs -BI<backend>>, but note
+that currently only the Perl 5 and JavaScript backends provide interactive
+shells.
 
 The normal runcore supports more features than the other runcores, the Parrot
-backend is quite fast, PIL2JS is good on binding and references, and PIL-Run
-offers excellent support for laziness.
+backend is quite fast, the JavaScript backend is good on binding and
+references, and Perl 6 on Perl 5 offers excellent support for laziness.
 
 =item C<-CI<backend>>
 
 causes Pugs to compile the program using C<I<backend>>. Currently, valid
-backends are C<Pugs>, C<Parrot>, C<PIR>, C<Haskell>, and C<PIL> with its
+backends are C<Pugs>, C<Parrot>, C<PIR>, C<Haskell>, C<JS>, and C<PIL> with its
 variants C<Perl5>, C<JSON>, and C<Binary>.
 

perl5/PIL2JS/runjs.pl

@@ -37 +37 @@
   "p6prelude=s"   => \$PIL2JS::cfg{prelude},
   "testpc=s"      => \$PIL2JS::cfg{testpc},
+  "compile-only"  => \my $compile_only,
   "help"          => \&usage,
 ) and @pugs_args or usage();
@@ -58 +59 @@
   @pugs_args
 ));
+print($js), exit if $compile_only;
 run_js($js);
 #run_js_on_jssm($js);
@@ -78 +80 @@
   --pil2js=/path/to/pil2js.pl               (usually in perl5/PIL2JS/)
   --p6prelude=/path/to/lib6/Prelude/JS.pm   (usually in perl5/PIL2JS/lib6/)
-  --p6preludepc=/path/to/preludepc.js       (compile using
-                                            perl5/PIL2JS/jspugs.pl)
+  --p6preludepc=/path/to/preludepc.js       (automatically created)
+  --compile-only
   --help
 EOF

src/Main.hs

@@ -79 +79 @@
 run ("-c":file:_)               = readFile file >>= doCheck file
 
+run ("-C":backend:args) | map toUpper backend == "JS" =
+    doHelperRun "JS" ("--compile-only":args)
 run ("-C":backend:"-e":prog:_)           = doCompileDump backend "-e" prog
 run ("-C":backend:file:_)                = slurpFile file >>= doCompileDump backend file
 
-run ("-B":backend:args)                  = doHelperRun backend args
+run ("-B":backend:args) | (== map toLower backend) `any` ["js","perl5"] =
+    doHelperRun backend args
+run ("-B":backend:"-e":prog:_)           = doCompileRun backend "-e" prog
+run ("-B":backend:file:_)                = slurpFile file >>= doCompileRun backend file
 
 run ("--external":mod:"-e":prog:_)    = doExternal mod "-e" prog

src/Pugs/CodeGen.hs

@@ -28 +28 @@
 generators :: Map String Generator
 generators = Map.fromList $
-    [ ("Ghc",         genGHC)
+    [ ("GHC",         genGHC)
     , ("Parrot",      genPIR)
-    , ("Pir",         genPIR)
-    , ("Pil",         genPIL)
---  , ("Pil2",        genPIL2)
+    , ("PIR",         genPIR)
+    , ("PIL",         genPIL)
+--  , ("PIL2",        genPIL2)
     , ("Perl5",       genPerl5)
     , ("Pugs",        genPugs)
     , ("Binary",      genBinary)
-    , ("Json",        genJSON)
---  , ("Xml",         genXML)
+    , ("JSON",        genJSON)
+--  , ("XML",         genXML)
     ]
 
@@ -44 +44 @@
 
 norm :: String -> String
-norm "" = ""
-norm (x:xs) = toUpper x : map toLower xs
+norm = norm' . map toLower
+    where
+    norm' "ghc"    = "GHC"
+    norm' "parrot" = "Parrot"
+    norm' "pir"    = "PIR"
+    norm' "pil"    = "PIL"
+    -- norm' "pil2"   = "PIL2"
+    norm' "perl5"  = "Perl5"
+    norm' "pugs"   = "Pugs"
+    norm' "binary" = "Binary"
+    norm' "json"   = "JSON"
+    -- norm' "xml"    = "XML"
+    norm' x        = x
 
 doLookup :: String -> IO Generator

src/Pugs/Help.hs

@@ -17 +17 @@
 import Pugs.Version
 import Pugs.CodeGen (backends)
+import Data.List (sort)
 
 printInteractiveHelp :: IO ()
@@ -51 +52 @@
         putStrLn "See documentation of pugs::run for more help."
     where
-    backendsStr = foldr1 addComma backends
+    backendsStr = foldr1 addComma $ sort ("JS":backends)
     addComma w s = w ++ (',':' ':s)