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

Assign Arithmetic BinaryOperators

Browse Source
This commit is contained in:
Rick Winfrey 2017-05-17 15:47:40 -07:00
parent d4288d6e68
commit 27e79fecb1
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Language/Python/Syntax.hs
View File

@ -18,6 +18,7 @@ type Syntax = Union Syntax'
type Syntax' = type Syntax' =
'[ Comment.Comment '[ Comment.Comment
, Declaration.Import , Declaration.Import
, Expression.Arithmetic
, Expression.Tuple , Expression.Tuple
, Expression.Unary , Expression.Unary
, Literal.Boolean , Literal.Boolean
@ -51,13 +52,23 @@ tuple :: HasCallStack => Assignment (Node Grammar) (Term Syntax Location)
tuple = makeTerm <$> symbol Tuple <*> children (Expression.Tuple <$> (many expression)) tuple = makeTerm <$> symbol Tuple <*> children (Expression.Tuple <$> (many expression))
expression :: HasCallStack => Assignment (Node Grammar) (Term Syntax Location) expression :: HasCallStack => Assignment (Node Grammar) (Term Syntax Location)
expression = identifier <|> statement <|> unaryOperator <|> tuple <|> literal expression = identifier <|> statement <|> unaryOperator <|> binaryOperator <|> tuple <|> literal
unaryOperator :: HasCallStack => Assignment (Node Grammar) (Term Syntax Location) unaryOperator :: HasCallStack => Assignment (Node Grammar) (Term Syntax Location)
unaryOperator = makeTerm <$> symbol UnaryOperator <*> children ( Expression.UCompliment <$> (symbol AnonTilde *> expression) unaryOperator = makeTerm <$> symbol UnaryOperator <*> children ( Expression.UCompliment <$> (symbol AnonTilde *> expression)
<|> Expression.UMinus <$> (symbol AnonMinus *> expression) <|> Expression.UMinus <$> (symbol AnonMinus *> expression)
<|> Expression.UPlus <$> (symbol AnonPlus *> expression)) <|> Expression.UPlus <$> (symbol AnonPlus *> expression))
binaryOperator :: HasCallStack => Assignment (Node Grammar) (Term Syntax Location)
binaryOperator = makeTerm <$> symbol BinaryOperator <*> children ( expression >>= \ lexpression -> arithmetic lexpression )
where
arithmetic lexpression = symbol AnonPlus *> (Expression.Plus lexpression <$> expression)
<|> symbol AnonMinus *> (Expression.Minus lexpression <$> expression)
<|> symbol AnonStar *> (Expression.Times lexpression <$> expression)
<|> symbol AnonSlash *> (Expression.DividedBy lexpression <$> expression)
<|> symbol AnonSlashSlash *> (Expression.DividedBy lexpression <$> expression)
<|> symbol AnonPercent *> (Expression.Modulo lexpression <$> expression)
<|> symbol AnonStarStar *> (Expression.Power lexpression <$> expression)
identifier :: HasCallStack => Assignment (Node Grammar) (Term Syntax Location) identifier :: HasCallStack => Assignment (Node Grammar) (Term Syntax Location)
identifier = makeTerm <$> symbol Identifier <*> (Syntax.Identifier <$> source) identifier = makeTerm <$> symbol Identifier <*> (Syntax.Identifier <$> source)