Author: Pascal "Pixel" Rigaux

Perl5Parser/Serialize.hs

@@ -64,6 +64,7 @@ to_s_QuoteLike Glob s = "<" ++ s ++ ">"
 to_s_QuoteLike Readline s = "<" ++ s ++ ">"
 to_s_QuoteLike Backstick s = "`" ++ s ++ "`"
 to_s_QuoteLike (Words t) s = "qw" ++ to_s_structure t s
+to_s_QuoteLike (Command t) s = "qx" ++ to_s_structure t s
 
 to_s_Regexp (Match Nothing s opt) = "/" ++ s ++ "/" ++ opt
 to_s_Regexp (Match (Just t) s opt) = "m" ++ to_s_structure t s ++ opt

Perl5Parser/Token.hs

@@ -82,6 +82,7 @@ p_Token = do pcons p spaces_comments
               <|> fmap Regexp Perl5Parser.Token.Regexp.p_Transliterate
               <|> fmap Regexp Perl5Parser.Token.Regexp.p_Qr
               <|> fmap to_QuoteLike Perl5Parser.Token.QuoteLike.p_Backstick
+              <|> fmap to_QuoteLike Perl5Parser.Token.QuoteLike.p_Qx
               <|> fmap to_QuoteLike Perl5Parser.Token.QuoteLike.p_Words
 
                   -- !! HereDoc before Readline and Glob !!

Perl5Parser/Token/QuoteLike.hs

@@ -3,6 +3,7 @@ module Perl5Parser.Token.QuoteLike
     , p_Glob
     , p_Words
     , p_Backstick
+    , p_Qx
     ) where
 
 import Perl5Parser.Types
@@ -33,3 +34,7 @@ p_Backstick :: Perl5Parser (QuoteLikeT, String)
 p_Backstick = do char '`'
                  (_, s) <- inside_string '`'
                  return (Backstick, s)
+
+p_Qx :: Perl5Parser (QuoteLikeT, String)
+p_Qx = do (structure, s) <- user_delimited_string "qx"
+          return (Command structure, s)

Perl5Parser/Types.hs

@@ -45,6 +45,7 @@ data QuoteLikeT =
   | Readline
   | Backstick
   | Words LiteralT
+  | Command LiteralT
     deriving Show
 
 type RegexpOptionT = String

test.hs

@@ -112,6 +112,9 @@ ok_exprs = [
            -- exprs
            , ("(sub { 1 }, 2)", "((sub { 1 }), 2)")
            , ("(sub => 1, 2)", "((sub => 1), 2)")
+           , ("qw (1 2)", "qw (1 2)")
+           , ("qx (1 2)", "qx (1 2)")
+           , ("qr (1 2)", "qr (1 2)")
            -- regexp
            , ("/\\//", "/\\//")
            , ("$s =~ s {1}   {2}", "$s =~ s {1}   {2}")