Merge branch 'main' of github.com:ralsina/tartrazine

This commit is contained in:
Roberto Alsina 2024-08-14 09:25:08 -03:00
commit 3725201f8a
4 changed files with 9 additions and 5 deletions

View File

@ -42,7 +42,6 @@ known_bad = {
"#{__DIR__}/tests/mcfunction/selectors.txt", "#{__DIR__}/tests/mcfunction/selectors.txt",
"#{__DIR__}/tests/php/anonymous_class.txt", "#{__DIR__}/tests/php/anonymous_class.txt",
"#{__DIR__}/tests/html/javascript_unclosed.txt", "#{__DIR__}/tests/html/javascript_unclosed.txt",
} }
# Tests that fail because of a limitation in PCRE2 # Tests that fail because of a limitation in PCRE2

View File

@ -30,7 +30,7 @@ module Tartrazine
@standalone : Bool = false, @standalone : Bool = false,
@surrounding_pre : Bool = true, @surrounding_pre : Bool = true,
@wrap_long_lines : Bool = false, @wrap_long_lines : Bool = false,
@weight_of_bold : Int32 = 600,) @weight_of_bold : Int32 = 600)
end end
def format(text : String, lexer : Lexer) : String def format(text : String, lexer : Lexer) : String

View File

@ -94,8 +94,13 @@ module Tartrazine
end end
# If no rule matches, emit an error token # If no rule matches, emit an error token
unless matched unless matched
# Log.trace { "Error at #{pos}" } if text[pos] == "\n"
tokens << {type: "Error", value: "#{text[pos]}"} # at EOL, reset state to "root"
tokens << {type: "TextWhitespace", value: "\n"}
@state_stack = ["root"]
else
tokens << {type: "Error", value: text[pos..pos]}
end
pos += 1 pos += 1
end end
end end

View File

@ -19,7 +19,7 @@ module Tartrazine
match = pattern.match(text, pos) match = pattern.match(text, pos)
# We don't match if the match doesn't move the cursor # We don't match if the match doesn't move the cursor
# because that causes infinite loops # because that causes infinite loops
return false, pos, [] of Token if match.nil? || match.end == 0 return false, pos, [] of Token if match.nil? || match.size == 0
# Log.trace { "#{match}, #{pattern.inspect}, #{text}, #{pos}" } # Log.trace { "#{match}, #{pattern.inspect}, #{text}, #{pos}" }
tokens = [] of Token tokens = [] of Token
# Emit the tokens # Emit the tokens