diff -r 72cbbfd88415 -r c9a386e4f1e0 SyntaxHighlighter2.st --- a/SyntaxHighlighter2.st Wed Jan 18 11:58:24 2012 +0100 +++ b/SyntaxHighlighter2.st Thu Jan 19 10:48:54 2012 +0100 @@ -242,7 +242,7 @@ binaryExpressionFor:receiverArg "parse a binary-expression; return a node-tree, nil or #Error" - |receiver expr arg sel pos1 pos2 lno note| + |receiver expr arg sel pos1 pos2 lno| receiver := receiverArg. (receiver == #Error) ifTrue:[^ #Error]. @@ -305,12 +305,7 @@ expr lineNumber:lno. expr selectorPosition:pos1. - (ignoreErrors or:[ignoreWarnings]) ifFalse:[ - note := self plausibilityCheck:expr. - note notNil ifTrue:[ - self warning:note position:pos1 to:pos2 - ]. - ]. + self checkPlausibilityOf:expr from:pos1 to:pos2. parseForCode ifFalse:[ self rememberSelectorUsed:sel receiver:receiver ]. @@ -319,8 +314,8 @@ ^ receiver "Modified: / 09-01-1998 / 19:05:18 / stefan" - "Modified: / 19-01-2000 / 16:22:04 / cg" "Modified: / 14-02-2010 / 17:54:53 / Jan Vrany " + "Modified: / 19-01-2012 / 10:46:49 / cg" ! expression @@ -468,7 +463,7 @@ | { KEYWORD-PART binaryExpression } " - |expr receiver sel arg args posR1 posR2 pos1 pos2 lno note positions constVal| + |expr receiver sel arg args posR1 posR2 pos1 pos2 lno positions constVal| receiver := receiverArg. posR1 := tokenPosition. @@ -515,12 +510,7 @@ expr := MessageNode receiver:receiver selector:sel args:args fold:nil. ]. expr lineNumber:lno. - (ignoreErrors or:[ignoreWarnings]) ifFalse:[ - note := self plausibilityCheck:expr. - note notNil ifTrue:[ - self warning:note position:pos1 to:pos2 - ]. - ]. + self checkPlausibilityOf:expr from:pos1 to:pos2. parseForCode ifFalse:[ self rememberSelectorUsed:sel receiver:receiver ]. @@ -606,14 +596,14 @@ ^ expr. - "Modified: / 19-01-2000 / 16:22:22 / cg" "Modified: / 14-02-2010 / 17:58:40 / Jan Vrany " + "Modified: / 19-01-2012 / 10:47:01 / cg" ! unaryExpressionFor:receiverArg "parse a unary-expression; return a node-tree, nil or #Error" - |receiver expr sel pos pos2 note lNr arguments| + |receiver expr sel pos pos2 lNr arguments| receiver := receiverArg. (receiver == #Error) ifTrue:[^ #Error]. @@ -645,12 +635,7 @@ expr := MessageNode receiver:receiver selector:sel args:arguments fold:nil. ]. expr lineNumber:lNr. - (ignoreErrors or:[ignoreWarnings]) ifFalse:[ - note := self plausibilityCheck:receiver. - note notNil ifTrue:[ - self warning:note position:pos to:pos2 - ]. - ]. + self checkPlausibilityOf:expr from:pos to:pos2. parseForCode ifFalse:[ self rememberSelectorUsed:sel receiver:receiver ]. @@ -667,12 +652,7 @@ ]. expr lineNumber:lNr. - (ignoreErrors or:[ignoreWarnings]) ifFalse:[ - note := self plausibilityCheck:expr. - note notNil ifTrue:[ - self warning:note position:pos to:pos2 - ]. - ]. + self checkPlausibilityOf:expr from:pos to:pos2. parseForCode ifFalse:[ self rememberSelectorUsed:sel receiver:receiver ]. @@ -681,8 +661,8 @@ ]. ^ receiver - "Modified: / 16-07-2006 / 16:15:22 / cg" "Modified: / 14-02-2010 / 17:56:21 / Jan Vrany " + "Modified: / 19-01-2012 / 10:47:37 / cg" ! ! !SyntaxHighlighter2 methodsFor:'syntax detection'! @@ -790,7 +770,7 @@ !SyntaxHighlighter2 class methodsFor:'documentation'! version_CVS - ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.7 2011-11-18 14:07:20 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.8 2012-01-19 09:48:54 cg Exp $' ! version_SVN