Changeset 2656

Timestamp:

05/03/05 20:15:53 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

4152

Message:

* experimental require_parrot() support.

(set the PUGS_EMBED env var to "parrot" to activate.)

Files:

• Makefile.PL (modified) (5 diffs)
• src/Pugs/Embed.hs (modified) (1 diff)
• src/Pugs/Prim.hs (modified) (2 diffs)

Makefile.PL

@@ -3 +3 @@
 use warnings;
 use Config;
+use Cwd qw(abs_path);
 use File::Spec;
 use lib 'lib';
@@ -86 +87 @@
 .
     }
-        
 
     my $ghc_output = "-o pugs$Config{_exe} src/Main.hs";
@@ -103 +103 @@
     $ghc_output .= " $pcre @syck @pge $unicode";
 
+    my $embed_flags;
+    if ($ENV{PUGS_EMBED} and $ENV{PUGS_EMBED} =~ /\bparrot\b/i) {
+        my $base = $ENV{PARROT_PATH};
+        if (!$base and -d "../parrot") {
+            $base = abs_path('../parrot/');
+        }
+        (-d $base and -e "$base/parrot-config.imc")
+            or die "*** Please set \$ENV{PARROT_PATH} to the base path with a built parrot tree.\n";
+        $embed_flags .= " -I$base/include -L$base/blib/lib -DPUGS_HAVE_PARROT=1 -L/usr/local/lib";
+        $ghc_output .= " -lparrot -licuuc -licudata "
+    }
+
     my $config = get_pugs_config();
     my $is_win32 = ($^O =~ /MSWin|mingw|cygwin/i);
@@ -159 +171 @@
 
 optimized :: src/Pugs/Config.hs @srcfiles $version_h @prereqs
-        $ghc $threaded -O --make $ghc_flags $ghc_output
+        $ghc $threaded -O --make $ghc_flags $embed_flags $ghc_output
 
 unoptimised :: optimized
 
 unoptimized :: src/Pugs/Config.hs @srcfiles $version_h @prereqs
-        $ghc $threaded -O0 --make $ghc_flags $ghc_output
+        $ghc $threaded -O0 --make $ghc_flags $embed_flags $ghc_output
 
 $pugs : src/Pugs/Config.hs @srcfiles $version_h @prereqs
-        $ghc $threaded -O --make $ghc_flags $ghc_output
+        $ghc $threaded -O --make $ghc_flags $embed_flags $ghc_output
 
 smoke : $pugs util/run-smoke.pl
@@ -173 +185 @@
 
 ghci ::
-        $ghc --interactive $ghc_flags $ghc_output
+        $ghc --interactive $ghc_flags $embed_flags $ghc_output
 
 tags : @srcfiles

src/Pugs/Embed.hs

@@ -12 +12 @@
 module Pugs.Embed (
     module Pugs.Embed.Perl5,
-    module Pugs.Embed.Haskell
-    -- module Pugs.Embed.Parrot
-    -- module Pugs.Embed.Ponie
+    module Pugs.Embed.Haskell,
+    module Pugs.Embed.Parrot,
+    -- module Pugs.Embed.Ponie,
 ) where
 import Pugs.Embed.Perl5
 import Pugs.Embed.Haskell
--- import Pugs.Embed.Parrot
+import Pugs.Embed.Parrot
 -- import Pugs.Embed.Ponie
 

src/Pugs/Prim.hs

@@ -182 +182 @@
     externRequire "Haskell" name
     return $ VBool True
+op1 "require_parrot" = \v -> do
+    name    <- fromVal v
+    liftIO $ evalParrot name
+    return $ VBool True
 op1 "require" = \v -> do
     file    <- fromVal v
@@ -1449 +1453 @@
 \\n   Any       pre     require (?Str=$_)\
 \\n   Any       pre     require_haskell (Str)\
+\\n   Any       pre     require_parrot  (Str)\
 \\n   Any       pre     last    (?Int=1)\
 \\n   Any       pre     next    (?Int=1)\