Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: crystal-lang/crystal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6e0e4e81eb2e
Choose a base ref
...
head repository: crystal-lang/crystal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7aa1a080a7de
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 26, 2017

  1. Remove 'macro def' related code from lexer.cr 

    Follow #5040 change
    @makenowjust
    makenowjust committed Sep 26, 2017
    Copy the full SHA
    ef7fe20 View commit details

Commits on Sep 27, 2017

  1. Merge pull request #5043 from MakeNowJust/fix/crystal-lexer/follow-re… 

    …move-macro-def

Remove 'macro def' related code from lexer.cr
    @asterite
    asterite authored Sep 27, 2017
    Copy the full SHA
    7aa1a08 View commit details
Showing with 0 additions and 9 deletions.
  1. +0 −9 src/compiler/crystal/syntax/lexer.cr
9 changes: 0 additions & 9 deletions src/compiler/crystal/syntax/lexer.cr
View file
Original file line number Diff line number Diff line change
@@ -2147,15 +2147,6 @@ module Crystal
elsif !delimiter_state && whitespace && (keyword = lookahead { check_macro_opening_keyword(beginning_of_line) })
char = current_char

if keyword == :macro && char.ascii_whitespace?
old_pos = @reader.pos
if next_char == 'd' && next_char == 'e' && next_char == 'f' && !ident_part_or_end?(peek_next_char)
char = next_char
else
@reader.pos = old_pos
end
end

nest += 1 unless keyword == :abstract_def
whitespace = true
beginning_of_line = false