github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-22 14:21:31 +03:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into graph-cli

Browse Source
This commit is contained in:
Timothy Clem 2018-04-09 11:03:32 -07:00
commit ce76f0f51b
49 changed files with 212 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Language/Ruby/Assignment.hs
View File

@ -74,6 +74,7 @@ type Syntax = '[
, Syntax.Identifier
, Syntax.Paren
, Syntax.Program
, Ruby.Syntax.Send
, Ruby.Syntax.Class
, Ruby.Syntax.Load
, Ruby.Syntax.LowPrecedenceBoolean
@ -83,7 +84,8 @@ type Syntax = '[
]
type Term = Term.Term (Union Syntax) (Record Location)
type Assignment = HasCallStack => Assignment.Assignment [] Grammar Term
type Assignment' a = HasCallStack => Assignment.Assignment [] Grammar a
type Assignment = Assignment' Term
-- | Assignment from AST in Ruby’s grammar onto a program in Ruby’s syntax.
assignment :: Assignment
@ -291,9 +293,12 @@ pair :: Assignment
pair = makeTerm <$> symbol Pair <*> children (Literal.KeyValue <$> expression <*> (expression <|> emptyTerm))
methodCall :: Assignment
methodCall = makeTerm' <$> symbol MethodCall <*> children (require <|> load <|> regularCall)
methodCall = makeTerm' <$> symbol MethodCall <*> children (require <|> load <|> funcCall <|> regularCall)
where
regularCall = inj <$> (Expression.Call <$> pure [] <*> expression <*> args <*> (block <|> emptyTerm))
funcCall = inj <$> (Ruby.Syntax.Send Nothing <$> methodSelector <*> args <*> optional block)
regularCall = inj <$> (symbol Call *> children (Ruby.Syntax.Send <$> (Just <$> expression) <*> methodSelector) <*> args <*> optional block)
require = inj <$> (symbol Identifier *> do
s <- source
guard (s `elem` ["require", "require_relative"])
@ -302,14 +307,17 @@ methodCall = makeTerm' <$> symbol MethodCall <*> children (require <|> load <|>
s <- source
guard (s == "load")
Ruby.Syntax.Load <$> loadArgs)
args = (symbol ArgumentList <|> symbol ArgumentListWithParens) *> children (many expression) <|> pure []
args = (symbol ArgumentList <|> symbol ArgumentListWithParens) *> children (many expression) <|> many expression
loadArgs = (symbol ArgumentList <|> symbol ArgumentListWithParens) *> children (some expression)
nameExpression = (symbol ArgumentList <|> symbol ArgumentListWithParens) *> children expression
call :: Assignment
call = makeTerm <$> symbol Call <*> children (Expression.MemberAccess <$> expression <*> (expression <|> args))
methodSelector :: Assignment
methodSelector = mk Identifier <|> mk Identifier'
where
args = (symbol ArgumentList <|> symbol ArgumentListWithParens) *> children expressions
mk s = makeTerm <$> symbol s <*> (Syntax.Identifier <$> (name <$> source))
call :: Assignment
call = makeTerm <$> symbol Call <*> children (Ruby.Syntax.Send <$> (Just <$> expression) <*> methodSelector <*> pure [] <*> optional block)
rescue :: Assignment
rescue = rescue'

16
src/Language/Ruby/Syntax.hs
View File

@ -36,6 +36,22 @@ maybeFailNotFound name = maybeFail notFound
cleanNameOrPath :: ByteString -> String
cleanNameOrPath = BC.unpack . dropRelativePrefix . stripQuotes
data Send a = Send { sendReceiver :: Maybe a, sendSelector :: a, sendArgs :: [a], sendBlock :: Maybe a }
deriving (Diffable, Eq, Foldable, Functor, GAlign, Generic1, Mergeable, Ord, Show, Traversable, FreeVariables1)
instance Eq1 Send where liftEq = genericLiftEq
instance Ord1 Send where liftCompare = genericLiftCompare
instance Show1 Send where liftShowsPrec = genericLiftShowsPrec
instance Evaluatable Send where
eval Send{..} = do
func <- case sendReceiver of
Just recv -> do
recvEnv <- subtermValue recv >>= scopedEnvironment
localEnv (mappend recvEnv) (subtermValue sendSelector)
Nothing -> subtermValue sendSelector -- TODO Does this require `localize` so we don't leak terms when resolving `sendSelector`?
call func (map subtermValue sendArgs) -- TODO pass through sendBlock
data Require a = Require { requireRelative :: Bool, requirePath :: !a }
deriving (Diffable, Eq, Foldable, Functor, GAlign, Generic1, Mergeable, Ord, Show, Traversable, FreeVariables1)

5
test/fixtures/ruby/begin.diffA-B.txt vendored
View File

@ -5,7 +5,6 @@
(
(Try
{ ([])
->(Call
->(Send
{+(Identifier)+}
{+(TextElement)+}
{+(Empty)+}) }))))
{+(TextElement)+}) }))))

5
test/fixtures/ruby/begin.diffB-A.txt vendored
View File

@ -4,8 +4,7 @@
(Identifier)
(
(Try
{ (Call
{ (Send
{-(Identifier)-}
{-(TextElement)-}
{-(Empty)-})
{-(TextElement)-})
->([]) }))))

5
test/fixtures/ruby/begin.parseB.txt vendored
View File

@ -4,7 +4,6 @@
(Identifier)
(
(Try
(Call
(Send
(Identifier)
(TextElement)
(Empty))))))
(TextElement))))))

10
test/fixtures/ruby/else.diffA-B.txt vendored
View File

@ -1,12 +1,10 @@
(Program
(Try
(
(Call
(Identifier)
(Empty))
(Send
(Identifier))
(Else
(Empty)
{ ([])
->(Call
{+(Identifier)+}
{+(Empty)+}) }))))
->(Send
{+(Identifier)+}) }))))

10
test/fixtures/ruby/else.diffB-A.txt vendored
View File

@ -1,12 +1,10 @@
(Program
(Try
(
(Call
(Identifier)
(Empty))
(Send
(Identifier))
(Else
(Empty)
{ (Call
{-(Identifier)-}
{-(Empty)-})
{ (Send
{-(Identifier)-})
->([]) }))))

5
test/fixtures/ruby/else.parseA.txt vendored
View File

@ -1,9 +1,8 @@
(Program
(Try
(
(Call
(Identifier)
(Empty))
(Send
(Identifier))
(Else
(Empty)
([])))))

10
test/fixtures/ruby/else.parseB.txt vendored
View File

@ -1,11 +1,9 @@
(Program
(Try
(
(Call
(Identifier)
(Empty))
(Send
(Identifier))
(Else
(Empty)
(Call
(Identifier)
(Empty))))))
(Send
(Identifier))))))

10
test/fixtures/ruby/elsif.diffA-B.txt vendored
View File

@ -2,13 +2,11 @@
(If
(Identifier)
(
(Call
(Identifier)
(Empty)))
(Send
(Identifier)))
(If
(Identifier)
(
{+(Call
{+(Identifier)+}
{+(Empty)+})+})
{+(Send
{+(Identifier)+})+})
(Empty))))

10
test/fixtures/ruby/elsif.diffB-A.txt vendored
View File

@ -2,13 +2,11 @@
(If
(Identifier)
(
(Call
(Identifier)
(Empty)))
(Send
(Identifier)))
(If
(Identifier)
([]
{-(Call
{-(Identifier)-}
{-(Empty)-})-})
{-(Send
{-(Identifier)-})-})
(Empty))))

5
test/fixtures/ruby/elsif.parseA.txt vendored
View File

@ -2,9 +2,8 @@
(If
(Identifier)
(
(Call
(Identifier)
(Empty)))
(Send
(Identifier)))
(If
(Identifier)
([])

10
test/fixtures/ruby/elsif.parseB.txt vendored
View File

@ -2,13 +2,11 @@
(If
(Identifier)
(
(Call
(Identifier)
(Empty)))
(Send
(Identifier)))
(If
(Identifier)
(
(Call
(Identifier)
(Empty)))
(Send
(Identifier)))
(Empty))))

5
test/fixtures/ruby/for.diffA-B.txt vendored
View File

@ -6,10 +6,9 @@
{+(Integer)+}
{+(Integer)+}
{+(Integer)+})+}
{+(Call
{+(Send
{+(Identifier)+}
{+(Identifier)+}
{+(Empty)+})+})+}
{+(Identifier)+})+})+}
{-(ForEach
{-(
{-(Identifier)-})-}

5
test/fixtures/ruby/for.diffB-A.txt vendored
View File

@ -22,10 +22,9 @@
{+(Integer)+}
{+(Integer)+}
{+(Empty)+}) }
{ (Call
{ (Send
{-(Identifier)-}
{-(Identifier)-}
{-(Empty)-})
{-(Identifier)-})
->(Boolean) })
{+(ForEach
{+(

5
test/fixtures/ruby/for.parseB.txt vendored
View File

@ -6,7 +6,6 @@
(Integer)
(Integer)
(Integer))
(Call
(Send
(Identifier)
(Identifier)
(Empty))))
(Identifier))))

15
test/fixtures/ruby/heredoc.diffA-B.txt vendored
View File

@ -1,12 +1,9 @@
(Program
{+(Call
{+(MemberAccess
{+(Call
{+(Identifier)+}
{+(TextElement)+}
{+(TextElement)+}
{+(Empty)+})+}
{+(Identifier)+})+}
{+(Empty)+})+}
{+(Send
{+(Send
{+(Identifier)+}
{+(TextElement)+}
{+(TextElement)+})+}
{+(Identifier)+})+}
{-(TextElement)-}
{-(TextElement)-})

15
test/fixtures/ruby/heredoc.diffB-A.txt vendored
View File

@ -1,12 +1,9 @@
(Program
{+(TextElement)+}
{+(TextElement)+}
{-(Call
{-(MemberAccess
{-(Call
{-(Identifier)-}
{-(TextElement)-}
{-(TextElement)-}
{-(Empty)-})-}
{-(Identifier)-})-}
{-(Empty)-})-})
{-(Send
{-(Send
{-(Identifier)-}
{-(TextElement)-}
{-(TextElement)-})-}
{-(Identifier)-})-})

15
test/fixtures/ruby/heredoc.parseB.txt vendored
View File

@ -1,10 +1,7 @@
(Program
(Call
(MemberAccess
(Call
(Identifier)
(TextElement)
(TextElement)
(Empty))
(Identifier))
(Empty)))
(Send
(Send
(Identifier)
(TextElement)
(TextElement))
(Identifier)))

9
test/fixtures/ruby/lambda.diffA-B.txt vendored
View File

@ -1,9 +1,8 @@
(Program
{-(Call
{-(Send
{-(Identifier)-}
{-(Hash)-}
{-(Empty)-})-}
(Call
{-(Hash)-})-}
(Send
(Identifier)
(Function
(Empty)
@ -12,7 +11,7 @@
->(Plus
{+(Identifier)+}
{+(Integer)+}) }))
{-(Call
{-(Send
{-(Identifier)-}
{-(Function
{-(Empty)-}

9
test/fixtures/ruby/lambda.diffB-A.txt vendored
View File

@ -1,9 +1,8 @@
(Program
{+(Call
{+(Send
{+(Identifier)+}
{+(Hash)+}
{+(Empty)+})+}
(Call
{+(Hash)+})+}
(Send
(Identifier)
(Function
(Empty)
@ -12,7 +11,7 @@
{-(Identifier)-}
{-(Integer)-})
->(Identifier) }))
{+(Call
{+(Send
{+(Identifier)+}
{+(Function
{+(Empty)+}

9
test/fixtures/ruby/lambda.parseA.txt vendored
View File

@ -1,14 +1,13 @@
(Program
(Call
(Send
(Identifier)
(Hash)
(Empty))
(Call
(Hash))
(Send
(Identifier)
(Function
(Empty)
(Identifier)))
(Call
(Send
(Identifier)
(Function
(Empty)

2
test/fixtures/ruby/lambda.parseB.txt vendored
View File

@ -1,5 +1,5 @@
(Program
(Call
(Send
(Identifier)
(Function
(Empty)

5
test/fixtures/ruby/method-calls-hash-args.diffA-B.txt vendored
View File

@ -1,10 +1,9 @@
(Program
(Call
(Send
(Identifier)
(KeyValue
(Symbol)
(Boolean))
{+(KeyValue
{+(Symbol)+}
{+(Integer)+})+}
(Empty)))
{+(Integer)+})+}))

5
test/fixtures/ruby/method-calls-hash-args.diffB-A.txt vendored
View File

@ -1,10 +1,9 @@
(Program
(Call
(Send
(Identifier)
(KeyValue
(Symbol)
(Boolean))
{-(KeyValue
{-(Symbol)-}
{-(Integer)-})-}
(Empty)))
{-(Integer)-})-}))

5
test/fixtures/ruby/method-calls-hash-args.parseA.txt vendored
View File

@ -1,7 +1,6 @@
(Program
(Call
(Send
(Identifier)
(KeyValue
(Symbol)
(Boolean))
(Empty)))
(Boolean))))

5
test/fixtures/ruby/method-calls-hash-args.parseB.txt vendored
View File

@ -1,10 +1,9 @@
(Program
(Call
(Send
(Identifier)
(KeyValue
(Symbol)
(Boolean))
(KeyValue
(Symbol)
(Integer))
(Empty)))
(Integer))))

5
test/fixtures/ruby/method-calls-keyword-args.diffA-B.txt vendored
View File

@ -1,10 +1,9 @@
(Program
(Call
(Send
(Identifier)
(KeyValue
(Identifier)
(Boolean))
{+(KeyValue
{+(Identifier)+}
{+(Integer)+})+}
(Empty)))
{+(Integer)+})+}))

5
test/fixtures/ruby/method-calls-keyword-args.diffB-A.txt vendored
View File

@ -1,10 +1,9 @@
(Program
(Call
(Send
(Identifier)
(KeyValue
(Identifier)
(Boolean))
{-(KeyValue
{-(Identifier)-}
{-(Integer)-})-}
(Empty)))
{-(Integer)-})-}))

5
test/fixtures/ruby/method-calls-keyword-args.parseA.txt vendored
View File

@ -1,7 +1,6 @@
(Program
(Call
(Send
(Identifier)
(KeyValue
(Identifier)
(Boolean))
(Empty)))
(Boolean))))

5
test/fixtures/ruby/method-calls-keyword-args.parseB.txt vendored
View File

@ -1,10 +1,9 @@
(Program
(Call
(Send
(Identifier)
(KeyValue
(Identifier)
(Boolean))
(KeyValue
(Identifier)
(Integer))
(Empty)))
(Integer))))

28
test/fixtures/ruby/method-calls.diffA-B.txt vendored
View File

@ -1,11 +1,9 @@
(Program
(Call
{ (MemberAccess
{-(Identifier)-}
{-(Identifier)-})
->(Identifier) }
(Empty))
{-(Call
(Send
{-(Identifier)-}
{ (Identifier)
->(Identifier) })
{-(Send
{-(Identifier)-}
{-(Identifier)-}
{-(Identifier)-}
@ -14,16 +12,13 @@
{-(Integer)-})-}
{-(KeyValue
{-(Identifier)-}
{-(Integer)-})-}
{-(Empty)-})-}
{-(Call
{-(Integer)-})-})-}
{-(Send
{-(Identifier)-}
{-(Call
{-(Send
{-(Identifier)-}
{-(Identifier)-}
{-(Empty)-})-}
{-(Empty)-})-}
{-(Call
{-(Identifier)-})-})-}
{-(Send
{-(Identifier)-}
{-(KeyValue
{-(Array)-}
@ -35,5 +30,4 @@
{-(Identifier)-}
{-(Function
{-(Empty)-}
{-(Integer)-})-})-}
{-(Empty)-})-})
{-(Integer)-})-})-})-})

26
test/fixtures/ruby/method-calls.diffB-A.txt vendored
View File

@ -1,11 +1,9 @@
(Program
(Call
(Send
{+(Identifier)+}
{ (Identifier)
->(MemberAccess
{+(Identifier)+}
{+(Identifier)+}) }
(Empty))
{+(Call
->(Identifier) })
{+(Send
{+(Identifier)+}
{+(Identifier)+}
{+(Identifier)+}
@ -14,16 +12,13 @@
{+(Integer)+})+}
{+(KeyValue
{+(Identifier)+}
{+(Integer)+})+}
{+(Empty)+})+}
{+(Call
{+(Integer)+})+})+}
{+(Send
{+(Identifier)+}
{+(Call
{+(Send
{+(Identifier)+}
{+(Identifier)+}
{+(Empty)+})+}
{+(Empty)+})+}
{+(Call
{+(Identifier)+})+})+}
{+(Send
{+(Identifier)+}
{+(KeyValue
{+(Array)+}
@ -35,5 +30,4 @@
{+(Identifier)+}
{+(Function
{+(Empty)+}
{+(Integer)+})+})+}
{+(Empty)+})+})
{+(Integer)+})+})+})+})

26
test/fixtures/ruby/method-calls.parseA.txt vendored
View File

@ -1,10 +1,8 @@
(Program
(Call
(MemberAccess
(Identifier)
(Identifier))
(Empty))
(Call
(Send
(Identifier)
(Identifier))
(Send
(Identifier)
(Identifier)
(Identifier)
@ -13,16 +11,13 @@
(Integer))
(KeyValue
(Identifier)
(Integer))
(Empty))
(Call
(Integer)))
(Send
(Identifier)
(Call
(Send
(Identifier)
(Identifier)
(Empty))
(Empty))
(Call
(Identifier)))
(Send
(Identifier)
(KeyValue
(Array)
@ -34,5 +29,4 @@
(Identifier)
(Function
(Empty)
(Integer)))
(Empty)))
(Integer)))))

5
test/fixtures/ruby/method-calls.parseB.txt vendored
View File

@ -1,4 +1,3 @@
(Program
(Call
(Identifier)
(Empty)))
(Send
(Identifier)))

34
test/fixtures/ruby/method-invocation.diffA-B.txt vendored
View File

@ -1,25 +1,17 @@
(Program
{+(Call
{+(Send
{+(Identifier)+}
{+(TextElement)+}
{+(Empty)+})+}
{+(Call
{+(MemberAccess
{+(Identifier)+}
{+(Identifier)+})+}
{+(Empty)+})+}
{+(Call
{+(Identifier)+}
{+(Integer)+}
{+(Integer)+}
{+(Empty)+})+}
{+(Call
{+(Identifier)+}
{+(Integer)+}
{+(Integer)+}
{+(Empty)+})+}
{+(TextElement)+})+}
{-(Identifier)-}
{-(MemberAccess
{-(Identifier)-}
{-(Identifier)-})-}
(Send
(Identifier)
(Identifier))
{+(Send
{+(Identifier)+}
{+(Integer)+}
{+(Integer)+})+}
{+(Send
{+(Identifier)+}
{+(Integer)+}
{+(Integer)+})+}
{-(Identifier)-})

28
test/fixtures/ruby/method-invocation.diffB-A.txt vendored
View File

@ -1,25 +1,17 @@
(Program
{+(Identifier)+}
{+(MemberAccess
{+(Identifier)+}
{+(Identifier)+})+}
{-(Send
{-(Identifier)-}
{-(TextElement)-})-}
(Send
(Identifier)
(Identifier))
{+(Identifier)+}
{-(Call
{-(Identifier)-}
{-(TextElement)-}
{-(Empty)-})-}
{-(Call
{-(MemberAccess
{-(Identifier)-}
{-(Identifier)-})-}
{-(Empty)-})-}
{-(Call
{-(Send
{-(Identifier)-}
{-(Integer)-}
{-(Integer)-}
{-(Empty)-})-}
{-(Call
{-(Integer)-})-}
{-(Send
{-(Identifier)-}
{-(Integer)-}
{-(Integer)-}
{-(Empty)-})-})
{-(Integer)-})-})

2
test/fixtures/ruby/method-invocation.parseA.txt vendored
View File

@ -1,6 +1,6 @@
(Program
(Identifier)
(MemberAccess
(Send
(Identifier)
(Identifier))
(Identifier))

23
test/fixtures/ruby/method-invocation.parseB.txt vendored
View File

@ -1,20 +1,15 @@
(Program
(Call
(Send
(Identifier)
(TextElement)
(Empty))
(Call
(MemberAccess
(Identifier)
(Identifier))
(Empty))
(Call
(TextElement))
(Send
(Identifier)
(Identifier))
(Send
(Identifier)
(Integer)
(Integer)
(Empty))
(Call
(Integer))
(Send
(Identifier)
(Integer)
(Integer)
(Empty)))
(Integer)))

8
test/fixtures/ruby/multiple-assignments.diffA-B.txt vendored
View File

@ -37,17 +37,17 @@
{-(Identifier)-})-}
{-(Assignment
{-(
{-(MemberAccess
{-(Send
{-(Identifier)-}
{-(Identifier)-})-}
{-(MemberAccess
{-(Send
{-(Identifier)-}
{-(Identifier)-})-})-}
{-(
{-(MemberAccess
{-(Send
{-(Identifier)-}
{-(Identifier)-})-}
{-(MemberAccess
{-(Send
{-(Identifier)-}
{-(Identifier)-})-})-})-}
{-(Assignment

8
test/fixtures/ruby/multiple-assignments.diffB-A.txt vendored
View File

@ -37,17 +37,17 @@
{+(Identifier)+})+}
{+(Assignment
{+(
{+(MemberAccess
{+(Send
{+(Identifier)+}
{+(Identifier)+})+}
{+(MemberAccess
{+(Send
{+(Identifier)+}
{+(Identifier)+})+})+}
{+(
{+(MemberAccess
{+(Send
{+(Identifier)+}
{+(Identifier)+})+}
{+(MemberAccess
{+(Send
{+(Identifier)+}
{+(Identifier)+})+})+})+}
{+(Assignment

8
test/fixtures/ruby/multiple-assignments.parseA.txt vendored
View File

@ -36,17 +36,17 @@
(Identifier))
(Assignment
(
(MemberAccess
(Send
(Identifier)
(Identifier))
(MemberAccess
(Send
(Identifier)
(Identifier)))
(
(MemberAccess
(Send
(Identifier)
(Identifier))
(MemberAccess
(Send
(Identifier)
(Identifier))))
(Assignment

7
test/fixtures/ruby/relational-operator.diffA-B.txt vendored
View File

@ -1,5 +1,5 @@
(Program
{(Equal
{ (Equal
{-(Identifier)-}
{-(Identifier)-})
->(Comparison
@ -10,11 +10,12 @@
{+(Identifier)+})+}
{+(Assignment
{+(Identifier)+}
{+(Not{+(Identifier)+})+})+}
{+(Not
{+(Identifier)+})+})+}
{-(Not
{-(Equal
{-(Identifier)-}
{-(Identifier)-})-})-}
{-(Equal
{-(Identifier)-}
{-(Identifier)-})- })
{-(Identifier)-})-})

5
test/fixtures/ruby/relational-operator.diffB-A.txt vendored
View File

@ -1,5 +1,5 @@
(Program
{(Comparison
{ (Comparison
{-(Identifier)-}
{-(Identifier)-})
->(Equal
@ -17,4 +17,5 @@
{-(Identifier)-})-}
{-(Assignment
{-(Identifier)-}
{-(Not{-(Identifier)-})-})- })
{-(Not
{-(Identifier)-})-})-})

5
test/fixtures/ruby/require.diffA-B.txt vendored
View File

@ -2,10 +2,9 @@
(Require
{ (TextElement)
->(TextElement) })
(Call
(Send
{ (Identifier)
->(Identifier) }
{+(Symbol)+}
{+(TextElement)+}
{-(Identifier)-}
(Empty)))
{-(Identifier)-}))

5
test/fixtures/ruby/require.diffB-A.txt vendored
View File

@ -2,10 +2,9 @@
(Require
{ (TextElement)
->(TextElement) })
(Call
(Send
{ (Identifier)
->(Identifier) }
{+(Identifier)+}
{-(Symbol)-}
{-(TextElement)-}
(Empty)))
{-(TextElement)-}))

5
test/fixtures/ruby/require.parseA.txt vendored
View File

@ -1,7 +1,6 @@
(Program
(Require
(TextElement))
(Call
(Send
(Identifier)
(Identifier)
(Empty)))
(Identifier)))

5
test/fixtures/ruby/require.parseB.txt vendored
View File

@ -1,8 +1,7 @@
(Program
(Require
(TextElement))
(Call
(Send
(Identifier)
(Symbol)
(TextElement)
(Empty)))
(TextElement)))

2
vendor/haskell-tree-sitter vendored

@ -1 +1 @@
Subproject commit 3b06fc65be9708336e003e43fb6b57d3da4b17f7
Subproject commit c753eea52bbee0927d36b5de4cf83c155b2698ef