File tree Expand file tree Collapse file tree 1 file changed +19
-18
lines changed
Expand file tree Collapse file tree 1 file changed +19
-18
lines changed Original file line number Diff line number Diff line change 5252# ––––––––––––––
5353# The Good Stuff
5454# ––––––––––––––
55- SCOPE_STARTERS = [Tokens. BEGIN,
56- Tokens. WHILE,
57- Tokens. IF,
58- Tokens. FOR,
59- Tokens. TRY,
60- Tokens. FUNCTION,
61- Tokens. MACRO,
62- Tokens. LET,
63- Tokens. ABSTRACT,
64- Tokens. TYPE,
65- Tokens. BITSTYPE,
66- Tokens. IMMUTABLE,
67- Tokens. DO,
68- Tokens. QUOTE
69- ]
55+ const SCOPE_STARTERS = [Tokens. BEGIN,
56+ Tokens. WHILE,
57+ Tokens. IF,
58+ Tokens. FOR,
59+ Tokens. TRY,
60+ Tokens. FUNCTION,
61+ Tokens. MACRO,
62+ Tokens. LET,
63+ Tokens. ABSTRACT,
64+ Tokens. TYPE,
65+ Tokens. BITSTYPE,
66+ Tokens. IMMUTABLE,
67+ Tokens. DO,
68+ Tokens. QUOTE]
69+
70+ const MODULE_STARTERS = [Tokens. MODULE, Tokens. BAREMODULE]
7071
7172"""
7273Takes Julia source code and a line number, gives back the string name
@@ -93,13 +94,13 @@ function codemodule(code, line)
9394 if Tokens. kind(t) == Tokens. RSQUARE
9495 n_brackets -= 1
9596 end
96- elseif Tokens. exactkind(t) in [Tokens . MODULE, Tokens . BAREMODULE] # new module
97+ elseif Tokens. exactkind(t) in MODULE_STARTERS # new module
9798 next_modulename = i + 2
9899 elseif i == next_modulename && Tokens. kind(t) == Tokens. IDENTIFIER
99100 push!(stack, Tokens. untokenize(t))
100- elseif Tokens. exactkind(t) in SCOPE_STARTERS # new non-module scope
101+ elseif Tokens. exactkind(t) in SCOPE_STARTERS # new non-module scope
101102 n_openers += 1
102- elseif Tokens. exactkind(t) == Tokens. END # scope ended
103+ elseif Tokens. exactkind(t) == Tokens. END # scope ended
103104 n_openers == 0 ? (! isempty(stack) && pop!(stack)) : n_openers -= 1
104105 end
105106 end
You can’t perform that action at this time.
0 commit comments