tokenizing for Ruby blocks (functions)

src/Data/Reprinting/Token.hs

@@ -49,6 +49,8 @@ data Context
   | THash
   | TPair
   | TMethod
+  | TFunction
+  | TCall
   | TParams
   | Infix Operator
   | Imperative

src/Data/Syntax/Declaration.hs

@@ -32,6 +32,14 @@ instance Evaluatable Function where
     pure (Rval addr)
     where paramNames = foldMap (maybeToList . declaredName . subterm)
 
+instance Tokenize Function where
+  tokenize Function{..} = within TFunction $ do
+    yield TOpen
+    functionName
+    surround_ TParams (sep functionParameters)
+    functionBody
+    yield TClose
+
 instance Declarations1 Function where
   liftDeclaredName declaredName = declaredName . functionName
 

src/Language/Ruby/Assignment.hs

@@ -51,7 +51,7 @@ type MiniSyntax = '[
     Literal.Integer
   , Comment.Comment
   , Declaration.Method
-  -- , Declaration.Function
+  , Declaration.Function
   -- , Expression.Call
   , Ruby.Syntax.Send
   -- , Ruby.Syntax.Load
@@ -73,11 +73,12 @@ miniAssignment = handleError $ makeTerm <$> symbol Program <*> children (Stateme
     expression = term . handleError $
       choice [ number
              , identifier
-             , method ]
-             -- , methodCall ]
+             , method
+             , methodCall ]
 
+    -- NOTE: Important that we don't flatten out the Imperative for single item lists
     expressions :: Assignment MiniTerm
-    expressions = makeTerm'' <$> location <*> many expression
+    expressions = makeTerm <$> location <*> many expression
 
     number :: Assignment MiniTerm
     number = makeTerm <$> symbol Grammar.Integer <*> (Literal.Integer <$> source)
@@ -152,7 +153,7 @@ miniAssignment = handleError $ makeTerm <$> symbol Program <*> children (Stateme
     methodCall :: Assignment MiniTerm
     methodCall = makeTerm' <$> symbol MethodCall <*> children send -- (require <|> load <|> send)
       where
-        send = inject <$> ((regularCall <|> funcCall <|> scopeCall <|> dotCall) <*> pure Nothing {- optional block -})
+        send = inject <$> ((regularCall <|> funcCall <|> scopeCall <|> dotCall) <*> optional block)
 
         funcCall = Ruby.Syntax.Send Nothing <$> selector <*> args
         regularCall = symbol Call *> children (Ruby.Syntax.Send <$> (Just <$> expression) <*> selector) <*> args
@@ -173,12 +174,12 @@ miniAssignment = handleError $ makeTerm <$> symbol Program <*> children (Stateme
     args :: Assignment [MiniTerm]
     args = (symbol ArgumentList <|> symbol ArgumentListWithParens) *> children (many expression) <|> many expression
 
-    -- block :: Assignment MiniTerm
-    -- block =  makeTerm <$> symbol DoBlock <*> scopedBlockChildren
-    --      <|> makeTerm <$> symbol Block <*> scopedBlockChildren
-    --   where scopedBlockChildren = withExtendedScope blockChildren
-    --         blockChildren = children (Declaration.Function [] <$> emptyTerm <*> params <*> expressions)
-    --         params = symbol BlockParameters *> children (many parameter) <|> pure []
+    block :: Assignment MiniTerm
+    block =  makeTerm <$> symbol DoBlock <*> scopedBlockChildren
+         <|> makeTerm <$> symbol Block <*> scopedBlockChildren
+      where scopedBlockChildren = withExtendedScope blockChildren
+            blockChildren = children (Declaration.Function [] <$> emptyTerm <*> params <*> expressions)
+            params = symbol BlockParameters *> children (many parameter) <|> pure []
 
     comment :: Assignment MiniTerm
     comment = makeTerm <$> symbol Comment <*> (Comment.Comment <$> source)

src/Language/Ruby/Syntax.hs

@@ -13,6 +13,7 @@ import qualified Data.Text as T
 import           Diffing.Algorithm
 import           Prologue
 import           Proto3.Suite.Class
+import           Reprinting.Tokenize
 import           System.FilePath.Posix
 
 
@@ -65,6 +66,13 @@ instance Evaluatable Send where
     args <- traverse subtermAddress sendArgs
     Rval <$> call func recv args -- TODO pass through sendBlock
 
+instance Tokenize Send where
+  tokenize Send{..} = within TCall $ do
+    maybe (pure ()) (\r -> r *> yield TSep) sendReceiver
+    fromMaybe (pure ()) sendSelector
+    surround_ TParams (sep sendArgs)
+    fromMaybe (pure ()) sendBlock
+
 data Require a = Require { requireRelative :: Bool, requirePath :: !a }
   deriving (Declarations1, Diffable, Eq, Foldable, FreeVariables1, Functor, Generic1, Hashable1, Ord, Show, ToJSONFields1, Traversable, Named1, Message1)
 

src/Language/Ruby/Translate.hs

@@ -16,9 +16,15 @@ step s@(Unhandled el cs) = case (el, cs) of
   (TOpen,  TMethod:_)  -> emit "def" <> layout Space
   (TClose, TMethod:xs) -> endContext (depth xs) <> emit "end"
 
-  (TOpen,  TParams:TMethod:_) -> emit "("
-  (TSep,   TParams:TMethod:_) -> emit "," <> layout Space
-  (TClose, TParams:TMethod:_) -> emit ")"
+  -- TODO: do..end vs {..} should be configurable.
+  (TOpen,  TFunction:_) -> layout Space <> emit "do" <> layout Space
+  (TOpen,  TParams:TFunction:_) -> emit "|"
+  (TClose, TParams:TFunction:_) -> emit "|"
+  (TClose, TFunction:xs) -> endContext (depth xs) <> emit "end"
+
+  (TOpen,  TParams:_) -> emit "("
+  (TSep,   TParams:_) -> emit "," <> layout Space
+  (TClose, TParams:_) -> emit ")"
 
   (TOpen,  Imperative:[]) -> mempty
   (TOpen,  Imperative:xs) -> layout HardWrap <> indent (depth xs)
@@ -26,6 +32,8 @@ step s@(Unhandled el cs) = case (el, cs) of
   (TClose, Imperative:[]) -> layout HardWrap
   (TClose, Imperative:xs) -> indent (pred (depth xs))
 
+  (TSep, TCall:_) -> emit "."
+
   _ -> pure s
 
   where

test/fixtures/ruby/reprinting/function.rb

@@ -1,5 +1,7 @@
-def foo(x, y)
-  def bar(); end
+def foo(x)
   x
-  5
+end
+
+5.times do |i|
+  i
 end