Commite4d4b15

committed

Move where we concatenate tokens to handle ignoreErrorOrder

This was causing one of the tokenizer test failures.

1 parentd9b1a9f commite4d4b15Copy full SHA for e4d4b15

File tree

-1

lines changed

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,7 @@ def tokensMatch(expectedTokens, receivedTokens, ignoreErrorOrder,`
`109`	`109`	`token.pop()`
`110`	`110`
`111`	`111`	`ifnotignoreErrorOrderandnotignoreErrors:`
	`112`	`+expectedTokens=concatenateCharacterTokens(expectedTokens)`
`112`	`113`	`returnexpectedTokens==receivedTokens`
`113`	`114`	`else:`
`114`	`115`	`# Sort the tokens into two groups; non-parse errors and parse errors`
`@@ -121,6 +122,7 @@ def tokensMatch(expectedTokens, receivedTokens, ignoreErrorOrder,`
`121`	`122`	`else:`
`122`	`123`	`ifnotignoreErrors:`
`123`	`124`	`tokens[tokenType][1].append(token)`
	`125`	`+tokens[tokenType][0]=concatenateCharacterTokens(tokens[tokenType][0])`
`124`	`126`	`returntokens["expected"]==tokens["received"]`
`125`	`127`
`126`	`128`
`@@ -174,7 +176,7 @@ def runTokenizerTest(test):`
`174`	`176`	`warnings.resetwarnings()`
`175`	`177`	`warnings.simplefilter("error")`
`176`	`178`
`177`		`-expected=concatenateCharacterTokens(test['output'])`
	`179`	`+expected=test['output']`
`178`	`180`	`if'lastStartTag'notintest:`
`179`	`181`	`test['lastStartTag']=None`
`180`	`182`	`parser=TokenizerTestParser(test['initialState'],`

Comments

(0)