Changeset 5137

Timestamp:

07/01/05 22:48:43 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

6965

Message:

* perl script/pugscc --run -e 'say 1+3' now compiles again

(need to test non-TH builds)

Location:

src

Files:

• Pugs/Compile/Pugs.hs (modified) (2 diffs)
• perl6/Prelude.pm (modified) (1 diff)

src/Pugs/Compile/Pugs.hs

@@ -32 +32 @@
 #if !defined(PUGS_HAVE_PERL5) && !defined(PUGS_HAVE_PARROT) && defined(PUGS_HAVE_TH) && (__GLASGOW_HASKELL__ <= 604)
 prettyRecord :: String -> [(String, Doc)] -> Doc
-prettyRecord con = (text con <+>) . braces . sep . punctuate semi . map assign
+prettyRecord con = (text con <+>) . braces . sep . punctuate comma . map assign
     where assign (name, val) = text name <+> char '=' <+> val
 #endif
@@ -83 +83 @@
                 , text ("return (" ++ show n ++ ", tvars)")
                 ]
+
+instance (Typeable a) => Compile (Maybe (TVar a)) where
+    compile = const . return $ text "Nothing"
 
 instance Compile (TVar Bool, TVar VRef) where

src/perl6/Prelude.pm

@@ -182 +182 @@
 }
 
-sub Pugs::Internals::but_block ($obj, Code $code) {
+sub Pugs::Internals::but_block ($obj, Code $code) is primitive is safe {
     $code($obj);
     $obj;