Changeset 5444

Timestamp:

07/11/05 21:48:20 (3 years ago)

Author:

bsmith

svk:copy_cache_prev:

7349

Message:

* Moved version variables from Pugs.Help to Pugs.Version.
* Pugs.Help now import Pugs.CodeGen? so that it can produce a correct list of
backends in the -h message.
* Fixed script/pugscc to use the Ghc backend rather than the Haskell backend
for --haskell and --ghc.

Files:

• script/pugscc (modified) (1 diff)
• src/Pugs/Help.hs (modified) (3 diffs)
• src/Pugs/Parser.hs (modified) (1 diff)
• src/Pugs/Version.hs (added)
• util/PugsConfig.pm (modified) (1 diff)

script/pugscc

@@ -29 +29 @@
 
 my $backend = 'Pugs';
-if ($ARGV[0] =~ /^(?:-H|--haskell)$/) {
-    $backend = 'Haskell';
+if ($ARGV[0] =~ /^(?:-H|--haskell|--ghc)$/) {
+    $backend = 'Ghc';
     shift @ARGV;
 }

src/Pugs/Help.hs

@@ -10 +10 @@
 -}
 
-#define PUGS_VERSION "6"
-#define PUGS_DATE ""
 #include "pugs_config.h"
-#include "pugs_version.h"
 
 module Pugs.Help (printInteractiveHelp, printCommandLineHelp,
              banner, versnum, version, revnum,
              copyright, disclaimer, intro) where
+import Pugs.Version
+import Pugs.CodeGen (backends)
 
 printInteractiveHelp :: IO ()
@@ -43 +42 @@
         putStrLn "-Bbackend        execute using the compiler backend"
         putStrLn "-Cbackend        compile using the compiler backend"
-        putStrLn "                 (valid backends are: Pugs, Parrot, PIR, Haskell)"
+        putStrLn ("                 (valid backends are: " ++ backendsStr ++ ")")
         putStrLn "-Mmodule         execute 'use module' before executing the program"
         putStrLn "-h or --help     give this message"
@@ -51 +50 @@
         putStrLn "-l -d and -w are ignored for compatability with Perl 5"
         putStrLn "See documentation of pugs::run for more help."
-
-name :: String
-name       = "Perl6 User's Golfing System"
-versnum :: String
-versnum    = PUGS_VERSION
-date :: String
-date       = PUGS_DATE
-version :: String
-version    = name ++ ", version " ++ versnum ++ ", " ++ date ++ revision
-copyright :: String
-copyright  = "Copyright 2005 by Autrijus Tang"
-revnum :: String
-revnum     = show(PUGS_SVN_REVISION :: Integer)
-revision :: String
-revision
-    | rev <- revnum
-    , rev /= "0"
-    = " (r" ++ rev ++ ")"
-    | otherwise
-    = ""
-disclaimer :: String
-disclaimer =
-    "This software is distributed under the terms of the " ++
-    "GNU Public Licence.\n" ++
-    "NO WARRANTY WHATSOEVER IS PROVIDED. " ++
-    "See the details in the documentation."
+    where
+    backendsStr = foldr1 addComma backends
+    addComma w s = w ++ (',':' ':s)
 
 versionFill :: Int -> String

src/Pugs/Parser.hs

@@ -20 +20 @@
 import Pugs.Types
 import Pugs.Context
-import Pugs.Help
+import Pugs.Version (versnum)
 import Pugs.Lexer
 import Pugs.Rule

util/PugsConfig.pm

@@ -136 +136 @@
 
 import qualified Data.Map as Map
-import qualified Pugs.Help
+import qualified Pugs.Version
 
 config :: Map.Map String String
 config = Map.fromList
     [#all_definitions#
-    ,("pugs_versnum", Pugs.Help.versnum)
-    ,("pugs_version", Pugs.Help.version)
-    ,("pugs_revision", Pugs.Help.revnum)
+    ,("pugs_versnum", Pugs.Version.versnum)
+    ,("pugs_version", Pugs.Version.version)
+    ,("pugs_revision", Pugs.Version.revnum)
     ]