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

Refactor functionDeclaration

Browse Source
This commit is contained in:
Rick Winfrey 2017-11-29 17:56:12 -08:00
parent 951a846c53
commit 15cb0d7ec4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Language/Go/Assignment.hs
View File

@ -373,12 +373,11 @@ fallThroughStatement :: Assignment
fallThroughStatement = makeTerm <$> symbol FallthroughStatement <*> (Statement.Pattern <$> (makeTerm <$> location <*> (Syntax.Identifier <$> source)) <*> emptyTerm)
functionDeclaration :: Assignment
functionDeclaration = makeTerm <$> symbol FunctionDeclaration <*> children (mkTypedFunctionDeclaration <$> location <*> expression <*> manyTerm parameters <*> optional (types <|> identifier <|> returnParameters) <*> optional block)
<|> makeTerm <$> symbol FuncLiteral <*> children (mkTypedFunctionLiteral <$> location <*> emptyTerm <*> manyTerm parameters <*> optional (types <|> identifier <|> returnParameters) <*> block)
functionDeclaration = makeTerm <$> (symbol FunctionDeclaration <|> symbol FuncLiteral) <*> children (mkFunctionDeclaration <$> name <*> manyTerm parameters <*> (types <|> identifier <|> returnParameters <|> emptyTerm) <*> (block <|> emptyTerm))
where
mkTypedFunctionDeclaration loc name' params' types' block' = Declaration.Function [(maybe (makeTerm loc Syntax.Empty) id types')] name' params' (maybe (makeTerm loc Syntax.Empty) id block')
mkTypedFunctionLiteral loc name' params' types' block' = Declaration.Function [(maybe (makeTerm loc Syntax.Empty) id types')] name' params' block'
mkFunctionDeclaration name' params' types' block' = Declaration.Function [types'] name' params' block'
returnParameters = makeTerm <$> symbol Parameters <*> children (manyTerm expression)
name = makeTerm <$> location <*> manyTermsTill expression (void (symbol Parameters))
importDeclaration :: Assignment
importDeclaration = makeTerm <$> symbol ImportDeclaration <*> children (Declaration.Import <$> manyTerm expression)