Changeset 7866

Timestamp:

11/06/05 01:28:07 (3 years ago)

Author:

autrijus

Message:

* New compiler backend targets around PIL2:

./pugs -C PIL2-Perl5
./pugs -C PIL2-JSON
./pugs -C PIL2-Binary

The dash is optional (all nonalphanum is dropped), and
it's case insensitive. Eventually these will replace
the PIL1 variants when our p5/js codegens finishes the
migration.

Files:

• Pugs.cabal.in (modified) (1 diff)
• src/Pugs/CodeGen.hs (modified) (4 diffs)
• src/Pugs/CodeGen/PIL2.hs (modified) (2 diffs)
• src/Pugs/Compile/PIL2.hs (modified) (2 diffs)

Pugs.cabal.in

@@ -12 +12 @@
 author: Autrijus Tang <autrijus@autrijus.org>
 tested-with: GHC -any
-exposed-modules: Pugs Pugs.AST Pugs.AST.Internals Pugs.AST.Pad Pugs.AST.Pos Pugs.AST.Prag Pugs.AST.SIO Pugs.AST.Scope Pugs.Bind Pugs.CodeGen Pugs.CodeGen.Binary Pugs.CodeGen.JSON Pugs.CodeGen.PIL1 Pugs.CodeGen.PIL2 Pugs.CodeGen.PIR Pugs.CodeGen.PIR.Prelude Pugs.CodeGen.Perl5 Pugs.Compat Pugs.Compile Pugs.Compile.Haskell Pugs.Compile.Pugs Pugs.Config Pugs.Cont Pugs.Embed Pugs.Embed.Haskell Pugs.Embed.Parrot Pugs.Embed.Perl5 Pugs.Embed.Pugs Pugs.Eval Pugs.Eval.Var Pugs.External Pugs.External.Haskell Pugs.Help Pugs.Internals Pugs.Junc Pugs.Lexer Pugs.Monads Pugs.PIL1 Pugs.PIL2 Pugs.Parser Pugs.Parser.Number Pugs.Parser.Program Pugs.Parser.Types Pugs.Parser.Unsafe Pugs.Pretty Pugs.Prim Pugs.Prim.Code Pugs.Prim.Eval Pugs.Prim.FileTest Pugs.Prim.Keyed Pugs.Prim.Lifts Pugs.Prim.List Pugs.Prim.Match Pugs.Prim.Numeric Pugs.Prim.Param Pugs.Prim.Yaml Pugs.Rule Pugs.Rule.Char Pugs.Rule.Combinator Pugs.Rule.Error Pugs.Rule.Expr Pugs.Rule.Language Pugs.Rule.Pos Pugs.Rule.Prim Pugs.Rule.Token Pugs.Run Pugs.Run.Args Pugs.Run.Perl5 Pugs.Shell Pugs.Types Pugs.Version Emit.Common Emit.PIR 
+exposed-modules: Pugs Pugs.AST Pugs.AST.Internals Pugs.AST.Pad Pugs.AST.Pos Pugs.AST.Prag Pugs.AST.SIO Pugs.AST.Scope Pugs.Bind Pugs.CodeGen Pugs.CodeGen.Binary Pugs.CodeGen.JSON Pugs.CodeGen.PIL1 Pugs.CodeGen.PIL2 Pugs.CodeGen.PIR Pugs.CodeGen.PIR.Prelude Pugs.CodeGen.Perl5 Pugs.Compat Pugs.Compile Pugs.Compile.PIL2 Pugs.Compile.Haskell Pugs.Compile.Pugs Pugs.Config Pugs.Cont Pugs.Embed Pugs.Embed.Haskell Pugs.Embed.Parrot Pugs.Embed.Perl5 Pugs.Embed.Pugs Pugs.Eval Pugs.Eval.Var Pugs.External Pugs.External.Haskell Pugs.Help Pugs.Internals Pugs.Junc Pugs.Lexer Pugs.Monads Pugs.PIL1 Pugs.PIL2 Pugs.Parser Pugs.Parser.Number Pugs.Parser.Program Pugs.Parser.Types Pugs.Parser.Unsafe Pugs.Pretty Pugs.Prim Pugs.Prim.Code Pugs.Prim.Eval Pugs.Prim.FileTest Pugs.Prim.Keyed Pugs.Prim.Lifts Pugs.Prim.List Pugs.Prim.Match Pugs.Prim.Numeric Pugs.Prim.Param Pugs.Prim.Yaml Pugs.Rule Pugs.Rule.Char Pugs.Rule.Combinator Pugs.Rule.Error Pugs.Rule.Expr Pugs.Rule.Language Pugs.Rule.Pos Pugs.Rule.Prim Pugs.Rule.Token Pugs.Run Pugs.Run.Args Pugs.Run.Perl5 Pugs.Shell Pugs.Types Pugs.Version Emit.Common Emit.PIR 
 buildable: True
 c-sources: src/cbits/fpstring.c src/pcre/pcre.c __UNICODE_C__

src/Pugs/CodeGen.hs

@@ -14 +14 @@
 import Pugs.Internals
 import Pugs.CodeGen.PIL1 (genPIL1)
-import Pugs.CodeGen.PIL2 (genPIL2)
+import Pugs.CodeGen.PIL2 (genPIL2, genPIL2Perl5, genPIL2Binary, genPIL2JSON)
 import Pugs.CodeGen.PIR (genPIR)
 import Pugs.CodeGen.Perl5 (genPerl5)
@@ -33 +33 @@
     , ("PIL1",        genPIL1)
     , ("PIL2",        genPIL2)
+    , ("PIL2-Perl5",  genPIL2Perl5)
+    , ("PIL2-JSON",   genPIL2JSON)
+    , ("PIL2-Binary", genPIL2Binary)
     , ("Perl5",       genPerl5)
     , ("Pugs",        genPugs)
@@ -44 +47 @@
 
 norm :: String -> String
-norm = norm' . map toLower
+norm = norm' . map toLower . filter isAlphaNum
     where
     norm' "ghc"    = "GHC"
@@ -53 +56 @@
     norm' "pil2"   = "PIL2"
     norm' "perl5"  = "Perl5"
+    norm' "pil2perl5"  = "PIL2-Perl5"
+    norm' "pil2json"   = "PIL2-JSON"
+    norm' "pil2binary" = "PIL2-Binary"
     norm' "pugs"   = "Pugs"
     norm' "binary" = "Binary"

src/Pugs/CodeGen/PIL2.hs

@@ -2 +2 @@
 {-# OPTIONS_GHC -#include "../../UnicodeC.h" #-}
 
-module Pugs.CodeGen.PIL2 (genPIL2) where
+module Pugs.CodeGen.PIL2 (
+    genPIL2,
+    genPIL2Perl5, genPIL2Binary, genPIL2JSON
+) where
 import Pugs.Internals
 import Pugs.AST
-import Pugs.PIL1
-import Pugs.Compile
+import Pugs.PIL2
+import Pugs.Compile.PIL2
+import System.IO
+import System.Directory
+import DrIFT.Perl5
+import DrIFT.Binary
+import DrIFT.JSON
 
 genPIL2 :: Eval Val
@@ -17 +25 @@
         , "    }"
         ]
+
+genPIL2Perl5 :: Eval Val
+genPIL2Perl5 = do
+    penv <- compile () :: Eval PIL_Environment
+    return . VStr . unlines $ [showPerl5 penv]
+
+genPIL2Binary :: Eval Val
+genPIL2Binary = do
+    penv <- compile () :: Eval PIL_Environment
+    liftIO $ do
+        tmp         <- getTemporaryDirectory
+        (file, fh)  <- openBinaryTempFile tmp "pugs.bin"
+        bh          <- openBinIO fh
+        put_ bh penv
+        hClose fh
+        return $ VStr (unlines [file])
+
+genPIL2JSON :: Eval Val
+genPIL2JSON = do
+    penv <- compile () :: Eval PIL_Environment
+    return . VStr . unlines $ [showJSON penv]

src/Pugs/Compile/PIL2.hs

@@ -1 +1 @@
 {-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fno-warn-orphans -funbox-strict-fields -cpp #-}
-{-# OPTIONS_GHC -#include "../UnicodeC.h" #-}
-
-{-|
-    Compiler interface.
-
->   And words unheard were spoken then
->   Of folk and Men and Elven-kin,
->   Beyond the world were visions showed
->   Forbid to those that dwell therein...
--}
-
-module Pugs.Compile (
+{-# OPTIONS_GHC -#include "../../UnicodeC.h" #-}
+
+module Pugs.Compile.PIL2 (
     PIL_Stmts(..), PIL_Stmt(..), PIL_Expr(..), PIL_Decl(..), PIL_Literal(..), PIL_LValue(..),
     Compile(..),
@@ -26 +17 @@
 import Pugs.Eval.Var
 import Pugs.Monads
-import Pugs.PIL1
+import Pugs.PIL2
 import Emit.PIR
 import Text.PrettyPrint