github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2025-01-02 20:41:38 +03:00
Code Issues Projects Releases Wiki Activity

Syntax.Ty takes a list of fields.

Browse Source
This commit is contained in:
Rob Rix 2017-01-23 14:39:12 -05:00
parent 0474b79b97
commit f5d22fcc4d
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Language/Go.hs
View File

@ -26,7 +26,7 @@ termAssignment source (range :. category :. sourceSpan :. Nil) children = case (
(For, [forClause, body]) | Other "for_clause" <- Info.category (extract forClause) -> withDefaultInfo $ S.For (toList (unwrap forClause)) (toList (unwrap body))
(For, [rangeClause, body]) | Other "range_clause" <- Info.category (extract rangeClause) -> withDefaultInfo $ S.For (toList (unwrap rangeClause)) (toList (unwrap body))
(TypeDecl, [identifier, ty]) -> withDefaultInfo $ S.TypeDecl identifier ty
(StructTy, _) -> withDefaultInfo (S.Ty (withRanges range FieldDeclarations (S.Indexed children)))
(StructTy, _) -> withDefaultInfo (S.Ty children)
(FieldDecl, [idList]) | [ident] <- toList (unwrap idList)
-> withDefaultInfo (S.FieldDecl ident Nothing Nothing)
(FieldDecl, [idList, ty]) | [ident] <- toList (unwrap idList)
@ -48,7 +48,7 @@ termAssignment source (range :. category :. sourceSpan :. Nil) children = case (
(Defer, [expr]) -> withDefaultInfo $ S.Defer expr
(SubscriptAccess, [a, b]) -> withDefaultInfo $ S.SubscriptAccess a b
(IndexExpression, [a, b]) -> withDefaultInfo $ S.SubscriptAccess a b
(Slice, a : rest) -> Just $ withCategory Slice (S.SubscriptAccess a (withRanges range Element (S.Fixed rest)))
(Slice, a : rest) -> withDefaultInfo (S.SubscriptAccess a (withRanges range Element (S.Fixed rest)))
(Other "composite_literal", [ty, values]) | ArrayTy <- Info.category (extract ty)
-> withDefaultInfo $ S.Array (Just ty) (toList (unwrap values))
| DictionaryTy <- Info.category (extract ty)
@ -68,13 +68,11 @@ termAssignment source (range :. category :. sourceSpan :. Nil) children = case (
(FunctionCall, id : rest) -> withDefaultInfo $ S.FunctionCall id rest
(AnonymousFunction, [params, _, body]) | [params'] <- toList (unwrap params)
-> withDefaultInfo $ S.AnonymousFunction (toList (unwrap params')) (toList (unwrap body))
(PointerTy, [ty]) -> withDefaultInfo $ S.Ty ty
(ChannelTy, [ty]) -> withDefaultInfo $ S.Ty ty
(PointerTy, _) -> withDefaultInfo $ S.Ty children
(ChannelTy, _) -> withDefaultInfo $ S.Ty children
(Send, [channel, expr]) -> withDefaultInfo $ S.Send channel expr
(Operator, _) -> withDefaultInfo $ S.Operator children
(FunctionTy, _) ->
let params = withRanges range Params $ S.Indexed children
in withDefaultInfo $ S.Ty params
(FunctionTy, _) -> withDefaultInfo $ S.Ty children
(IncrementStatement, _) ->
withDefaultInfo $ S.Leaf $ toText source
(DecrementStatement, _) ->

6
src/Syntax.hs
View File

@ -45,7 +45,7 @@ data Syntax a f
-- | A subscript access contains a syntax, and another syntax that indefies a property or value in the first syntax.
-- | e.g. in Javascript x["y"] represents a subscript access syntax.
| SubscriptAccess { subscriptId :: f, subscriptElement :: f }
| Switch { switchExpr :: (Maybe f), cases :: [f] }
| Switch { switchExpr :: Maybe f, cases :: [f] }
| Case { caseExpr :: f, caseStatements :: [f] }
-- | A default case in a switch statement.
| DefaultCase [f]
@ -101,7 +101,7 @@ data Syntax a f
-- | A field declaration with an optional type, and an optional tag.
| FieldDecl f (Maybe f) (Maybe f)
-- | A type.
| Ty f
| Ty [f]
-- | A send statement has a channel and an expression in Go.
| Send f f
deriving (Eq, Foldable, Functor, Generic, Generic1, Mergeable, Ord, Show, Traversable, ToJSON)
@ -161,7 +161,7 @@ instance Listable2 Syntax where
\/ liftCons2 (liftTiers recur) recur ParameterDecl
\/ liftCons2 recur recur TypeDecl
\/ liftCons3 recur (liftTiers recur) (liftTiers recur) FieldDecl
\/ liftCons1 recur Ty
\/ liftCons1 (liftTiers recur) Ty
\/ liftCons2 recur recur Send
\/ liftCons1 (liftTiers recur) DefaultCase