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

Rename project to currentNode.

Browse Source
This commit is contained in:
Rob Rix 2017-08-16 10:33:56 -04:00
parent a8607ce41c
commit 2b4efe8435
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Data/Syntax/Assignment.hs
View File

@ -70,7 +70,7 @@ module Data.Syntax.Assignment
, Alternative(..) , Alternative(..)
, MonadError(..) , MonadError(..)
, location , location
, project , currentNode
, symbol , symbol
, source , source
, children , children
@ -132,7 +132,7 @@ data AssignmentF ast grammar a where
Put :: State ast -> AssignmentF ast grammar () Put :: State ast -> AssignmentF ast grammar ()
End :: HasCallStack => AssignmentF ast grammar () End :: HasCallStack => AssignmentF ast grammar ()
Location :: HasCallStack => AssignmentF ast grammar (Record Location) Location :: HasCallStack => AssignmentF ast grammar (Record Location)
Project :: HasCallStack => AssignmentF ast grammar (F.Base ast ()) CurrentNode :: HasCallStack => AssignmentF ast grammar (F.Base ast ())
Source :: HasCallStack => AssignmentF ast grammar ByteString Source :: HasCallStack => AssignmentF ast grammar ByteString
Children :: HasCallStack => Assignment ast grammar a -> AssignmentF ast grammar a Children :: HasCallStack => Assignment ast grammar a -> AssignmentF ast grammar a
Advance :: HasCallStack => AssignmentF ast grammar () Advance :: HasCallStack => AssignmentF ast grammar ()
@ -149,9 +149,9 @@ data AssignmentF ast grammar a where
location :: HasCallStack => Assignment ast grammar (Record Location) location :: HasCallStack => Assignment ast grammar (Record Location)
location = withFrozenCallStack $ Location `Then` return location = withFrozenCallStack $ Location `Then` return
-- | Zero-width projection of the current node. -- | Zero-width production of the current node.
project :: HasCallStack => Assignment ast grammar (F.Base ast ()) currentNode :: HasCallStack => Assignment ast grammar (F.Base ast ())
project = Project `Then` return currentNode = CurrentNode `Then` return
-- | Zero-width match of a node with the given symbol, producing the current node’s location. -- | Zero-width match of a node with the given symbol, producing the current node’s location.
symbol :: (Bounded grammar, Ix grammar, HasCallStack) => grammar -> Assignment ast grammar (Record Location) symbol :: (Bounded grammar, Ix grammar, HasCallStack) => grammar -> Assignment ast grammar (Record Location)
@ -252,7 +252,7 @@ runAssignment toNode source = \ assignment state -> go assignment state >>= requ
run assignment yield initialState = assignment `seq` expectedSymbols `seq` state `seq` maybe (anywhere Nothing) (atNode . F.project) (listToMaybe stateNodes) run assignment yield initialState = assignment `seq` expectedSymbols `seq` state `seq` maybe (anywhere Nothing) (atNode . F.project) (listToMaybe stateNodes)
where atNode node = case assignment of where atNode node = case assignment of
Location -> yield (nodeLocation (toNode node)) state Location -> yield (nodeLocation (toNode node)) state
Project -> yield (() <$ node) state CurrentNode -> yield (() <$ node) state
Source -> yield (Source.sourceBytes (Source.slice (nodeByteRange (toNode node)) source)) (advance state) Source -> yield (Source.sourceBytes (Source.slice (nodeByteRange (toNode node)) source)) (advance state)
Children child -> do Children child -> do
(a, state') <- go child state { stateNodes = toList node } >>= requireExhaustive (a, state') <- go child state { stateNodes = toList node } >>= requireExhaustive
@ -272,7 +272,7 @@ runAssignment toNode source = \ assignment state -> go assignment state >>= requ
Throw e -> Left (fromMaybe (makeError node) e) Throw e -> Left (fromMaybe (makeError node) e)
Catch during _ -> go during state >>= uncurry yield Catch during _ -> go during state >>= uncurry yield
Choose{} -> Left (makeError node) Choose{} -> Left (makeError node)
Project{} -> Left (makeError node) CurrentNode{} -> Left (makeError node)
Children{} -> Left (makeError node) Children{} -> Left (makeError node)
Source -> Left (makeError node) Source -> Left (makeError node)
Advance{} -> Left (makeError node) Advance{} -> Left (makeError node)
@ -385,7 +385,7 @@ instance (Show grammar, Show ast) => Show1 (AssignmentF ast grammar) where
End -> showString "End" . showChar ' ' . sp d () End -> showString "End" . showChar ' ' . sp d ()
Advance -> showString "Advance" . showChar ' ' . sp d () Advance -> showString "Advance" . showChar ' ' . sp d ()
Location -> showString "Location" . sp d (Info.Range 0 0 :. Info.Span (Info.Pos 1 1) (Info.Pos 1 1) :. Nil) Location -> showString "Location" . sp d (Info.Range 0 0 :. Info.Span (Info.Pos 1 1) (Info.Pos 1 1) :. Nil)
Project -> showString "Project" CurrentNode -> showString "CurrentNode"
Source -> showString "Source" . showChar ' ' . sp d "" Source -> showString "Source" . showChar ' ' . sp d ""
Children a -> showsUnaryWith (liftShowsPrec sp sl) "Children" d a Children a -> showsUnaryWith (liftShowsPrec sp sl) "Children" d a
Choose symbols choices -> showsBinaryWith showsPrec (const (liftShowList sp sl)) "Choose" d symbols (IntMap.toList choices) Choose symbols choices -> showsBinaryWith showsPrec (const (liftShowList sp sl)) "Choose" d symbols (IntMap.toList choices)

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

@ -70,14 +70,14 @@ paragraph = makeTerm <$> symbol Paragraph <*> children (Markup.Paragraph <$> man
list :: Assignment list :: Assignment
list = (:<) <$> symbol List <*> ((\ (Node (CMarkGFM.LIST CMarkGFM.ListAttributes{..}) _ _ Term.:< _) -> case listType of list = (:<) <$> symbol List <*> ((\ (Node (CMarkGFM.LIST CMarkGFM.ListAttributes{..}) _ _ Term.:< _) -> case listType of
CMarkGFM.BULLET_LIST -> inj . Markup.UnorderedList CMarkGFM.BULLET_LIST -> inj . Markup.UnorderedList
CMarkGFM.ORDERED_LIST -> inj . Markup.OrderedList) <$> project <*> children (many item)) CMarkGFM.ORDERED_LIST -> inj . Markup.OrderedList) <$> currentNode <*> children (many item))
item :: Assignment item :: Assignment
item = makeTerm <$> symbol Item <*> children (many blockElement) item = makeTerm <$> symbol Item <*> children (many blockElement)
section :: Assignment section :: Assignment
section = makeTerm <$> symbol Heading <*> (heading >>= \ headingTerm -> Markup.Section (level headingTerm) headingTerm <$> while (((<) `on` level) headingTerm) blockElement) section = makeTerm <$> symbol Heading <*> (heading >>= \ headingTerm -> Markup.Section (level headingTerm) headingTerm <$> while (((<) `on` level) headingTerm) blockElement)
where heading = makeTerm <$> symbol Heading <*> ((\ (Node (CMarkGFM.HEADING level) _ _ Term.:< _) -> Markup.Heading level) <$> project <*> children (many inlineElement)) where heading = makeTerm <$> symbol Heading <*> ((\ (Node (CMarkGFM.HEADING level) _ _ Term.:< _) -> Markup.Heading level) <$> currentNode <*> children (many inlineElement))
level term = case term of level term = case term of
_ | Just section <- prj (unwrap term) -> level (Markup.sectionHeading section) _ | Just section <- prj (unwrap term) -> level (Markup.sectionHeading section)
_ | Just heading <- prj (unwrap term) -> Markup.headingLevel heading _ | Just heading <- prj (unwrap term) -> Markup.headingLevel heading
@ -87,7 +87,7 @@ blockQuote :: Assignment
blockQuote = makeTerm <$> symbol BlockQuote <*> children (Markup.BlockQuote <$> many blockElement) blockQuote = makeTerm <$> symbol BlockQuote <*> children (Markup.BlockQuote <$> many blockElement)
codeBlock :: Assignment codeBlock :: Assignment
codeBlock = makeTerm <$> symbol CodeBlock <*> ((\ (Node (CMarkGFM.CODE_BLOCK language _) _ _ Term.:< _) -> Markup.Code (nullText language)) <$> project <*> source) codeBlock = makeTerm <$> symbol CodeBlock <*> ((\ (Node (CMarkGFM.CODE_BLOCK language _) _ _ Term.:< _) -> Markup.Code (nullText language)) <$> currentNode <*> source)
thematicBreak :: Assignment thematicBreak :: Assignment
thematicBreak = makeTerm <$> token ThematicBreak <*> pure Markup.ThematicBreak thematicBreak = makeTerm <$> token ThematicBreak <*> pure Markup.ThematicBreak
@ -125,10 +125,10 @@ htmlInline :: Assignment
htmlInline = makeTerm <$> symbol HTMLInline <*> (Markup.HTMLBlock <$> source) htmlInline = makeTerm <$> symbol HTMLInline <*> (Markup.HTMLBlock <$> source)
link :: Assignment link :: Assignment
link = makeTerm <$> symbol Link <*> ((\ (Node (CMarkGFM.LINK url title) _ _ Term.:< _) -> Markup.Link (encodeUtf8 url) (nullText title)) <$> project) <* advance link = makeTerm <$> symbol Link <*> ((\ (Node (CMarkGFM.LINK url title) _ _ Term.:< _) -> Markup.Link (encodeUtf8 url) (nullText title)) <$> currentNode) <* advance
image :: Assignment image :: Assignment
image = makeTerm <$> symbol Image <*> ((\ (Node (CMarkGFM.IMAGE url title) _ _ Term.:< _) -> Markup.Image (encodeUtf8 url) (nullText title)) <$> project) <* advance image = makeTerm <$> symbol Image <*> ((\ (Node (CMarkGFM.IMAGE url title) _ _ Term.:< _) -> Markup.Image (encodeUtf8 url) (nullText title)) <$> currentNode) <* advance
code :: Assignment code :: Assignment
code = makeTerm <$> symbol Code <*> (Markup.Code Nothing <$> source) code = makeTerm <$> symbol Code <*> (Markup.Code Nothing <$> source)