github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-11-28 01:47:01 +03:00
Code Issues Projects Releases Wiki Activity

Move cast to expression

Browse Source
This commit is contained in:
joshvera 2017-10-02 13:29:40 -07:00
parent a3d0a5dfc9
commit d8a6a3a423
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Data/Syntax/Expression.hs
View File

@ -154,3 +154,10 @@ newtype New a = New { newSubject :: a }
instance Eq1 New where liftEq = genericLiftEq
instance Show1 New where liftShowsPrec = genericLiftShowsPrec
-- | A cast expression to a specified type.
data Cast a = Cast { castSubject :: !a, castType :: !a }
deriving (Diffable, Eq, Foldable, Functor, GAlign, Generic1, Show, Traversable)
instance Eq1 Cast where liftEq = genericLiftEq
instance Show1 Cast where liftShowsPrec = genericLiftShowsPrec

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

@ -48,6 +48,7 @@ type Syntax = '[
, Expression.Bitwise
, Expression.Boolean
, Expression.Call
, Expression.Cast
, Expression.Comparison
, Expression.Enumeration
, Expression.MemberAccess
@ -127,7 +128,6 @@ type Syntax = '[
, Language.TypeScript.Syntax.Tuple
, Language.TypeScript.Syntax.Constructor
, Language.TypeScript.Syntax.TypeAssertion
, Language.TypeScript.Syntax.Cast
, Language.TypeScript.Syntax.ImportAlias
, Language.TypeScript.Syntax.Debugger
, Language.TypeScript.Syntax.ShorthandPropertyIdentifier
@ -248,12 +248,6 @@ data TypeAssertion a = TypeAssertion { _typeAssertionParameters :: !a, _typeAsse
instance Eq1 TypeAssertion where liftEq = genericLiftEq
instance Show1 TypeAssertion where liftShowsPrec = genericLiftShowsPrec
data Cast a = Cast { _castSubject :: !a, _castType :: !a }
deriving (Diffable, Eq, Foldable, Functor, GAlign, Generic1, Show, Traversable)
instance Eq1 Cast where liftEq = genericLiftEq
instance Show1 Cast where liftShowsPrec = genericLiftShowsPrec
newtype Annotation a = Annotation { _annotationType :: a }
deriving (Diffable, Eq, Foldable, Functor, GAlign, Generic1, Show, Traversable)
@ -720,7 +714,7 @@ typeAssertion :: Assignment
typeAssertion = makeTerm <$> symbol Grammar.TypeAssertion <*> children (Language.TypeScript.Syntax.TypeAssertion <$> typeArguments' <*> expression)
asExpression :: Assignment
asExpression = makeTerm <$> symbol AsExpression <*> children (Language.TypeScript.Syntax.Cast <$> expression <*> (ty <|> templateString))
asExpression = makeTerm <$> symbol AsExpression <*> children (Expression.Cast <$> expression <*> (ty <|> templateString))
templateString :: Assignment
templateString = makeTerm <$> symbol TemplateString <*> children (Literal.String <$> many (term templateSubstitution))