github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-09 14:15:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

$self includes work

Browse Source
This commit is contained in:
Corey Johnson & Nathan Sobo
2012-08-01 11:37:44 -07:00
parent bccd525084
commit 487c4ed439
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/parser.coffee
View File

@@ -47,6 +47,8 @@ class Grammar
ruleForInclude: (name) ->
if name[0] == "#"
@repository[name[1..]]
else if name == "$self"
@initialRule
class Rule
grammar: null
@@ -56,8 +58,9 @@ class Rule
constructor: (@grammar, {@scopeName, patterns, @endPattern}) ->
patterns ?= []
@patterns = patterns.map (pattern) => new Pattern(grammar, pattern)
@patterns = []
@patterns.push(@endPattern) if @endPattern
@patterns.push((patterns.map (pattern) => new Pattern(grammar, pattern))...)
getNextTokens: (stack, line, position) ->
{ match, pattern } = @getNextMatch(line, position)
@@ -73,6 +76,7 @@ class Rule
getNextMatch: (line, position) ->
nextMatch = null
matchedPattern = null
for pattern in @patterns
{ pattern, match } = pattern.getNextMatch(line, position)
if match
@@ -103,7 +107,8 @@ class Pattern
getNextMatch: (line, position) ->
if @include
@grammar.ruleForInclude(@include).getNextMatch(line, position)
rule = @grammar.ruleForInclude(@include)
rule.getNextMatch(line, position)
else
{ match: @regex.search(line, position), pattern: this }