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

Fix up methodDefinition

Browse Source
This commit is contained in:
joshvera 2017-08-11 15:54:46 -04:00
parent a9c98d06c6
commit 2b1d782c99
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Language/TypeScript/Syntax.hs
View File

@ -183,15 +183,16 @@ readonly' = symbol Readonly *> children source
methodDefinition :: Assignment
methodDefinition = makeVisibility <$>
symbol MethodDefinition
<*> children ((,,,,) <$> optional accessibilityModifier' <*> optional readonly' <*> propertyName <*> callSignature <*> statementBlock)
<*> children ((,,,,,) <$> optional accessibilityModifier' <*> optional readonly' <*> emptyTerm <*> propertyName <*> callSignature <*> statements)
where
makeVisibility loc (modifier, readonly, propertyName, callSignature, statements) = maybe method' (Type.Visibility <$> (makeReadonly loc method' readonly) <*>) modifier
where method' = makeTerm loc (Declaration.Method <$> propertyName <*> callSignature <*> statements)
makeReadonly loc term = maybe term (makeTerm loc . const (Type.Readonly term))
method' = makeTerm loc (Declaration.Method <$> propertyName <*> callSignature <*> statements)
makeVisibility loc (modifier, empty, readonly, propertyName, callSignature, statements) = maybe method'' (\x -> makeTerm loc (Type.Visibility (maybe method'' (const (makeReadonly loc method'')) readonly) x)) modifier
where method'' = method' loc empty propertyName callSignature statements
statementBlock :: Assignment
statementBlock = symbol StatementBlock *> many statement
method' loc term name signature statements = makeTerm loc (Declaration.Method term name signature statements)
makeReadonly loc = makeTerm loc . Type.Readonly
statements :: Assignment
statements = makeTerm <$> location <*> many statement
statement :: Assignment
statement =